Mercurial > hg > truffle

changeset 13205:bef512e42262

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Mon, 02 Dec 2013 12:45:18 +0100
parents ffa3d2d26cc2 (diff) 401e1473c546 (current diff)
children b96cc3b87e87
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java	Sat Nov 30 19:09:55 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java	Mon Dec 02 12:45:18 2013 +0100
@@ -98,7 +98,9 @@
             }
         } else if (barrierType == BarrierType.IMPRECISE) {
             if (useG1GC()) {
-                addG1PreWriteBarrier(node, node.object(), null, node.location(), true, node.getNullCheck(), graph);
+                if (!node.isInitialization()) {
+                    addG1PreWriteBarrier(node, node.object(), null, node.location(), true, node.getNullCheck(), graph);
+                }
                 addG1PostWriteBarrier(node, node.object(), node.value(), node.location(), false, graph);
             } else {
                 addSerialPostWriteBarrier(node, node.object(), node.value(), node.location(), false, graph);