Mercurial > hg > truffle
changeset 2650:ccab1d5f345e
Removed TestPatching option.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 11 May 2011 14:43:20 +0200 |
parents | 62306ff0ccc2 |
children | f9ae687657e8 |
files | graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java |
diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java Wed May 11 14:42:19 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java Wed May 11 14:43:20 2011 +0200 @@ -53,7 +53,6 @@ // debugging settings public static boolean VerifyPointerMaps = ____; public static boolean PinAllInstructions = ____; - public static boolean TestPatching = ____; public static boolean FatalUnimplemented = ____; public static int MethodEndBreakpointGuards = 0; public static boolean ZapStackOnMethodEntry = ____;
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed May 11 14:42:19 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed May 11 14:43:20 2011 +0200 @@ -331,7 +331,7 @@ if (con instanceof RiType) { // this is a load of class constant which might be unresolved RiType riType = (RiType) con; - if (!riType.isResolved() || C1XOptions.TestPatching) { + if (!riType.isResolved()) { ResolveClass rc = new ResolveClass(riType, RiType.Representation.JavaClass, graph, frameState.create(bci())); frameState.push(CiKind.Object, append(rc)); } else { @@ -540,7 +540,7 @@ private void genCheckCast() { int cpi = stream().readCPI(); RiType type = constantPool().lookupType(cpi, CHECKCAST); - boolean isInitialized = !C1XOptions.TestPatching && type.isResolved() && type.isInitialized(); + boolean isInitialized = type.isResolved() && type.isInitialized(); Value typeInstruction = genResolveClass(RiType.Representation.ObjectHub, type, isInitialized, cpi); CheckCast c = new CheckCast(type, typeInstruction, frameState.apop(), graph); frameState.apush(append(c)); @@ -549,7 +549,7 @@ private void genInstanceOf() { int cpi = stream().readCPI(); RiType type = constantPool().lookupType(cpi, INSTANCEOF); - boolean isInitialized = !C1XOptions.TestPatching && type.isResolved() && type.isInitialized(); + boolean isInitialized = type.isResolved() && type.isInitialized(); Value typeInstruction = genResolveClass(RiType.Representation.ObjectHub, type, isInitialized, cpi); InstanceOf i = new InstanceOf(type, typeInstruction, frameState.apop(), graph); frameState.ipush(append(i)); @@ -625,7 +625,7 @@ private void genGetStatic(int cpi, RiField field) { RiType holder = field.holder(); - boolean isInitialized = !C1XOptions.TestPatching && field.isResolved(); + boolean isInitialized = field.isResolved(); CiConstant constantValue = null; FrameState stateBefore = null; if (isInitialized) { @@ -679,7 +679,7 @@ private void genInvokeStatic(RiMethod target, int cpi, RiConstantPool constantPool) { RiType holder = target.holder(); - boolean isInitialized = !C1XOptions.TestPatching && target.isResolved() && holder.isInitialized(); + boolean isInitialized = target.isResolved() && holder.isInitialized(); if (!isInitialized && C1XOptions.ResolveClassBeforeStaticInvoke) { // Re-use the same resolution code as for accessing a static field. Even though // the result of resolution is not used by the invocation (only the side effect