Menu
▾
▴
[rvm-commits] jikesrvm: RVM-974: Guard all calls to _assert(...) in the RVM wi...
|
From: <jik...@li...> - 2012-07-10 15:21:35
|
details: http://jikesrvm.hg.sourceforge.net/hgweb/jikesrvm/jikesrvm/rev/a30c582678ec changeset: 10465:a30c582678ec user: Erik Brangs <eri...@gm...> date: Tue Jul 10 11:21:24 2012 +0200 description: RVM-974: Guard all calls to _assert(...) in the RVM with VM.VerifyAssertions. diffstat: MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java | 2 +- rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java | 4 +- rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java | 2 +- rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java | 2 +- rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java | 4 +- rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java | 2 +- rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java | 2 +- rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java | 2 +- rvm/src/org/jikesrvm/classloader/Atom.java | 4 +- rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java | 2 +- rvm/src/org/jikesrvm/classloader/ClassFileReader.java | 2 +- rvm/src/org/jikesrvm/classloader/RVMMethod.java | 2 +- rvm/src/org/jikesrvm/classloader/TypeReference.java | 2 +- rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java | 2 +- rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java | 6 +- rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java | 2 +- rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java | 2 +- rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java | 14 +- rvm/src/org/jikesrvm/compilers/common/assembler/ppc/Assembler.java | 66 +++--- rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java | 5 +- rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java | 8 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/OsrPointConstructor.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTNode.java | 4 +- rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java | 8 +- rvm/src/org/jikesrvm/compilers/opt/inlining/DefaultInlineOracle.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/lir2mir/NormalBURS.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java | 6 +- rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ComplexLIR2MIRExpansion.java | 8 +- rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/NormalizeConstants.java | 14 +- rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java | 6 +- rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/CallingConvention.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGCMap.java | 4 +- rvm/src/org/jikesrvm/compilers/opt/ssa/EnterSSA.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/ssa/LICM.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/ssa/LeaveSSA.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/ssa/LoopVersioning.java | 4 +- rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraph.java | 2 +- rvm/src/org/jikesrvm/ia32/CodeArray.java | 8 +- rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java | 6 +- rvm/src/org/jikesrvm/mm/mminterface/Barriers.java | 104 +++++----- rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java | 2 +- rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java | 2 +- rvm/src/org/jikesrvm/ppc/CodeArray.java | 8 +- rvm/src/org/jikesrvm/runtime/EntrypointHelper.java | 3 +- rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java | 3 +- rvm/src/org/jikesrvm/runtime/Statics.java | 2 +- rvm/src/org/jikesrvm/scheduler/RVMThread.java | 2 +- rvm/src/org/jikesrvm/scheduler/ThreadQueue.java | 2 +- rvm/src/org/jikesrvm/scheduler/TimerThread.java | 2 +- rvm/src/org/jikesrvm/util/LinkedListIteratorRVM.java | 8 +- rvm/src/org/jikesrvm/util/LinkedListRVM.java | 22 +- tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageObjectAddressRemapper.java | 2 +- tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java | 4 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/AddressArray.java | 8 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ArchitecturalWord.template | 2 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java | 8 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java | 8 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java | 8 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/WordArray.java | 14 +- 62 files changed, 221 insertions(+), 220 deletions(-) diffs (truncated from 2095 to 300 lines): diff -r 38e0ccb83e21 -r a30c582678ec MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java --- a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java Mon Jul 09 11:16:37 2012 +0200 +++ b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java Tue Jul 10 11:21:24 2012 +0200 @@ -145,7 +145,7 @@ case SOFT: return softReferenceProcessor; case PHANTOM: return phantomReferenceProcessor; default: - VM._assert(false,"Unrecognized semantics"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED,"Unrecognized semantics"); return null; } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java --- a/rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java Tue Jul 10 11:21:24 2012 +0200 @@ -474,7 +474,7 @@ emitTab(level); emit("if (VM.VerifyAssertions && !"); emitTest(argNumber, argEncoding); - emit(") VM._assert(false, inst.toString());\n"); + emit(") VM._assert(VM.NOT_REACHED, inst.toString());\n"); } /** @@ -952,7 +952,7 @@ emitTab(level); emit("if (VM.VerifyAssertions && !("); emitArgs(i, ArgumentType.GPRegister); - emit(".value() < 4)) VM._assert(false, inst.toString());\n"); + emit(".value() < 4)) VM._assert(VM.NOT_REACHED, inst.toString());\n"); } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java --- a/rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java Tue Jul 10 11:21:24 2012 +0200 @@ -218,7 +218,7 @@ OptCompiledMethod optMeth = (OptCompiledMethod) cmpMethod; return CompilerDNA.getCompilerConstant(optMeth.getOptLevel()); default: - if (VM.VerifyAssertions) VM._assert(false, "Unknown Compiler"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED, "Unknown Compiler"); return -1; } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java --- a/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java Tue Jul 10 11:21:24 2012 +0200 @@ -121,7 +121,7 @@ resizeCounters(getNumCounters() * 2); } } else { - VM._assert(false); + if (VM.VerifyAssertions) { VM._assert(VM.NOT_REACHED); } } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java --- a/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java Tue Jul 10 11:21:24 2012 +0200 @@ -41,7 +41,9 @@ @Override public void reset() { - VM._assert(false, "TODO: implement reset for BasicBlockCounterDatabase"); + if (VM.VerifyAssertions) { + VM._assert(VM.NOT_REACHED, "TODO: implement reset for BasicBlockCounterDatabase"); + } } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java --- a/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java Tue Jul 10 11:21:24 2012 +0200 @@ -59,7 +59,7 @@ } else if (Controller.options.mlCBS()) { RuntimeMeasurements.installCBSMethodListener(methodListener); } else { - if (VM.VerifyAssertions) VM._assert(false, "Unexpected value of method_listener_trigger"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED, "Unexpected value of method_listener_trigger"); } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java --- a/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java Tue Jul 10 11:21:24 2012 +0200 @@ -125,7 +125,7 @@ } else if (Controller.options.cgCBS()) { RuntimeMeasurements.installCBSContextListener((EdgeListener) listener); } else { - if (VM.VerifyAssertions) VM._assert(false, "Unexpected value of call_graph_listener_trigger"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED, "Unexpected value of call_graph_listener_trigger"); } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java --- a/rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java Tue Jul 10 11:21:24 2012 +0200 @@ -71,7 +71,7 @@ } else if (Controller.options.mlCBS()) { RuntimeMeasurements.installCBSMethodListener(methodListener); } else { - if (VM.VerifyAssertions) VM._assert(false, "Unexpected value of method_listener_trigger"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED, "Unexpected value of method_listener_trigger"); } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/classloader/Atom.java --- a/rvm/src/org/jikesrvm/classloader/Atom.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/classloader/Atom.java Tue Jul 10 11:21:24 2012 +0200 @@ -485,7 +485,7 @@ return TypeReference.findOrCreate(cl, findOrCreate(val, i, val.length - i, toUnicodeStringInternal())); default: if (VM.VerifyAssertions) { - VM._assert(false, + VM._assert(VM.NOT_REACHED, "Need a valid method descriptor; got \"" + this + "\"; can't parse the character '" + @@ -571,7 +571,7 @@ default: if (VM.VerifyAssertions) { - VM._assert(false, + VM._assert(VM.NOT_REACHED, "The class descriptor \"" + this + "\" contains the illegal" + diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java --- a/rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java Tue Jul 10 11:21:24 2012 +0200 @@ -22,7 +22,7 @@ final Member jdkMember; BootImageMemberLookupError(RVMMember rvmMember, Member jdkMember, Object o, Throwable t) { super(t); - if (VM.runningVM) { + if (VM.VerifyAssertions && VM.runningVM) { VM._assert(VM.NOT_REACHED); } this.rvmMember = rvmMember; diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/classloader/ClassFileReader.java --- a/rvm/src/org/jikesrvm/classloader/ClassFileReader.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/classloader/ClassFileReader.java Tue Jul 10 11:21:24 2012 +0200 @@ -505,7 +505,7 @@ case CP_STRING: return BYTES_IN_ADDRESS; default: - VM._assert(NOT_REACHED); + if (VM.VerifyAssertions) VM._assert(NOT_REACHED); return 0; } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/classloader/RVMMethod.java --- a/rvm/src/org/jikesrvm/classloader/RVMMethod.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/classloader/RVMMethod.java Tue Jul 10 11:21:24 2012 +0200 @@ -389,7 +389,7 @@ } else if (pt == RVMType.DoubleType) { return JBC_dreturn; } else { - VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return -1; } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/classloader/TypeReference.java --- a/rvm/src/org/jikesrvm/classloader/TypeReference.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/classloader/TypeReference.java Tue Jul 10 11:21:24 2012 +0200 @@ -405,7 +405,7 @@ } else if (this == CodeArray) { return Code; } else { - if (VM.VerifyAssertions) VM._assert(false, "Unexpected case of Magic arrays!"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED, "Unexpected case of Magic arrays!"); return null; } } else { diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java --- a/rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java Tue Jul 10 11:21:24 2012 +0200 @@ -42,7 +42,7 @@ } if (low >= high) { // search failed - if (VM.VerifyAssertions) { VM._assert(false); } + if (VM.VerifyAssertions) { VM._assert(VM.NOT_REACHED); } return null; } if (bci > bcIndex) { diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java --- a/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java Tue Jul 10 11:21:24 2012 +0200 @@ -152,7 +152,7 @@ // Double check logically uninterruptible methods have been annotated as // uninterruptible - // TODO: remove logically uninterruptible annotations + // TODO: remove logically uninterruptible annotations (see RVM-115). if (VM.VerifyAssertions && method.hasLogicallyUninterruptibleAnnotation()) { VM._assert(isUninterruptible, "LogicallyUninterruptible but not Uninterruptible method: ", method.toString()); @@ -204,7 +204,7 @@ if (compilerName.equals("baseline")) { VM.sysWrite("-methodBaseline "); } else if (VM.VerifyAssertions) { - VM._assert(false, "Unknown compiler"); + VM._assert(VM.NOT_REACHED, "Unknown compiler"); } VM.sysWrite(method.getDeclaringClass().toString()); VM.sysWrite(" "); @@ -1620,7 +1620,7 @@ if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("anewarray ", arrayRef, bcodes.index()); if (VM.VerifyAssertions && elementTypeRef.isUnboxedType()) { - VM._assert(false, + VM._assert(VM.NOT_REACHED, "During compilation of " + method + " found an anewarray of " + diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java --- a/rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java Tue Jul 10 11:21:24 2012 +0200 @@ -376,7 +376,7 @@ case JNI: return "JNI"; default: - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return null; } } diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java --- a/rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java Tue Jul 10 11:21:24 2012 +0200 @@ -129,7 +129,7 @@ } else if (compilerType == CompiledMethod.JNI) { cm = new JNICompiledMethod(id, m); } else { - if (VM.VerifyAssertions) VM._assert(false, "Unexpected compiler type!"); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED, "Unexpected compiler type!"); } setCompiledMethod(id, cm); return cm; diff -r 38e0ccb83e21 -r a30c582678ec rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java --- a/rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java Mon Jul 09 11:16:37 2012 +0200 +++ b/rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java Tue Jul 10 11:21:24 2012 +0200 @@ -373,7 +373,7 @@ return cm; } else { - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return null; } } @@ -407,7 +407,7 @@ } } } else { - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return null; } } @@ -436,7 +436,7 @@ } } } else { - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return null; } } @@ -471,7 +471,7 @@ return fallback(method); } } else { - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return null; } } @@ -515,7 +515,7 @@ compilationInProgress = false; } } else { - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return null; } } @@ -569,7 +569,7 @@ } } } else { - if (VM.VerifyAssertions) VM._assert(false); + if (VM.VerifyAssertions) VM._assert(VM.NOT_REACHED); return -1; } } @@ -588,7 +588,7 @@ |