Mercurial > hg > graal-compiler

changeset 22269:5b5b881f4689

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only fill allocations with garbage when assertions are enabled.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 21 Jul 2015 11:30:40 +0200
parents 1ea122032fc7
children b068e7d4db13
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java	Tue Jul 21 10:54:17 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java	Tue Jul 21 11:30:40 2015 +0200
@@ -368,9 +368,8 @@
      * @param startOffset offset to begin zeroing. May not be word aligned.
      * @param manualUnroll maximally unroll zeroing
      */
-    private static boolean fillWithGarbage(int size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, boolean useSnippetCounters) {
+    private static void fillWithGarbage(int size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, boolean useSnippetCounters) {
         fillMemory(0xfefefefefefefefeL, size, memory, constantSize, startOffset, manualUnroll, useSnippetCounters);
-        return true;
     }
 
     /**
@@ -389,8 +388,8 @@
         initializeObjectHeader(memory, prototypeMarkWord, hub);
         if (fillContents) {
             zeroMemory(size, memory, constantSize, instanceHeaderSize(), false, useSnippetCounters);
-        } else {
-            ReplacementsUtil.runtimeAssert(fillWithGarbage(size, memory, constantSize, instanceHeaderSize(), false, useSnippetCounters), "");
+        } else if (REPLACEMENTS_ASSERTIONS_ENABLED) {
+            fillWithGarbage(size, memory, constantSize, instanceHeaderSize(), false, useSnippetCounters);
         }
         return memory.toObject();
     }
@@ -420,8 +419,8 @@
         initializeObjectHeader(memory, prototypeMarkWord, hub);
         if (fillContents) {
             zeroMemory(allocationSize, memory, false, headerSize, maybeUnroll, useSnippetCounters);
-        } else {
-            ReplacementsUtil.runtimeAssert(fillWithGarbage(allocationSize, memory, false, headerSize, maybeUnroll, useSnippetCounters), "");
+        } else if (REPLACEMENTS_ASSERTIONS_ENABLED) {
+            fillWithGarbage(allocationSize, memory, false, headerSize, maybeUnroll, useSnippetCounters);
         }
         return memory.toObject();
     }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java	Tue Jul 21 10:54:17 2015 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java	Tue Jul 21 11:30:40 2015 +0200
@@ -31,7 +31,7 @@
         // empty
     }
 
-    private static final boolean REPLACEMENTS_ASSERTIONS_ENABLED;
+    public static final boolean REPLACEMENTS_ASSERTIONS_ENABLED;
 
     static {
         boolean assertionsEnabled = false;