Mercurial > hg > truffle

changeset 16869:6754b5b64978

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cover ForceMaterializeNode in NewFrameNode.getMaterializedRepresentationHelper()
author Michael Haupt <michael.haupt@oracle.com>
date Wed, 20 Aug 2014 15:17:17 +0200
parents db090a8d3705
children 11b22ccafccd
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java	Wed Aug 20 15:16:11 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java	Wed Aug 20 15:17:17 2014 +0200
@@ -117,7 +117,7 @@
     }
 
     public static ValueNode getMaterializedRepresentationHelper(VirtualObjectNode virtualNode, FixedNode fixed) {
-        if (fixed instanceof MaterializeFrameNode || fixed instanceof AbstractEndNode) {
+        if (fixed instanceof MaterializeFrameNode || fixed instanceof AbstractEndNode || fixed instanceof ForceMaterializeNode) {
             // We need to conservatively assume that a materialization of a virtual frame can also
             // happen at a merge point.
             return new AllocatedObjectNode(virtualNode);