# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1353338153 -3600
# Node ID e3ada110d3cf49f23ebaba2920912f429e0581ba
# Parent  2afd99933ae6cd6887ead6d827d0e768ff5c6405
Small cleanups after NPG

diff -r 2afd99933ae6 -r e3ada110d3cf mx/sanitycheck.py
--- a/mx/sanitycheck.py	Mon Nov 19 15:42:58 2012 +0100
+++ b/mx/sanitycheck.py	Mon Nov 19 16:15:53 2012 +0100
@@ -162,7 +162,7 @@
     dacapoMatcher = Matcher(dacapoTime, {'const:group' : "const:DaCapo", 'const:name' : 'benchmark', 'const:score' : 'time'}, startNewLine=True)
     dacapoMatcher1 = Matcher(dacapoTime1, {'const:group' : "const:DaCapo-1stRun", 'const:name' : 'benchmark', 'const:score' : 'time'})
     
-    return Test("DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher, dacapoMatcher1], ['-Xms2g', '-XX:MaxPermSize=256m', '-XX:+UseSerialGC'])
+    return Test("DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher, dacapoMatcher1], ['-Xms2g', '-XX:+UseSerialGC'])
 
 def getScalaDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]):
     checks = []
@@ -192,7 +192,7 @@
     
     dacapoMatcher = Matcher(dacapoTime, {'const:group' : "const:Scala-DaCapo", 'const:name' : 'benchmark', 'const:score' : 'time'})
     
-    return Test("Scala-DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher], ['-Xms2g', '-XX:MaxPermSize=256m', '-XX:+UseSerialGC'])
+    return Test("Scala-DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher], ['-Xms2g', '-XX:+UseSerialGC'])
 
 def getBootstraps():
     time = re.compile(r"Bootstrapping Graal\.+ in (?P<time>[0-9]+) ms")
diff -r 2afd99933ae6 -r e3ada110d3cf src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Mon Nov 19 15:42:58 2012 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Mon Nov 19 16:15:53 2012 +0100
@@ -109,7 +109,7 @@
   }
 
   if (reconstituted_code == NULL) {
-    env->SetByteArrayRegion(result, 0, code_size, (const jbyte *) method->code_base());
+    env->SetByteArrayRegion(result, 0, code_size, (jbyte *) method->code_base());
   } else {
     env->SetByteArrayRegion(result, 0, code_size, reconstituted_code);
   }