# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1435272001 -7200
# Node ID 49530d60ec9bd20afbf92165d8c83f5091082979
# Parent  42ab3ffc93154443c6d88fbbb9f3a99bdc6d2e08# Parent  eb025d2d7ce23f232b8bd463496c8fbeb0245200
Merge.

diff -r eb025d2d7ce2 -r 49530d60ec9b graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InlineDuringParsingPlugin.java
diff -r eb025d2d7ce2 -r 49530d60ec9b mx.graal/mx_graal.py
--- a/mx.graal/mx_graal.py	Thu Jun 25 14:30:49 2015 -0700
+++ b/mx.graal/mx_graal.py	Fri Jun 26 00:40:01 2015 +0200
@@ -1341,7 +1341,7 @@
     # Run ctw against rt.jar on server-hosted-jvmci
     with VM('server', 'product'):
         with Task('CTW:hosted-product', tasks) as t:
-            if t: ctw(['--ctwopts', '-Inline +ExitVMOnException', '-esa', '-G:+CompileTheWorldMultiThreaded', '-G:-CompileTheWorldVerbose'])
+            if t: ctw(['--ctwopts', '-Inline +ExitVMOnException', '-esa', '-G:+CompileTheWorldMultiThreaded', '-G:-InlineDuringParsing', '-G:-CompileTheWorldVerbose'])
 
     # Build the other VM flavors
     with Task('BuildHotSpotGraalOthers: fastdebug,product', tasks) as t: