Make exceptionHandlers in org.jikesrvm.compilers.opt.ir.BasicBlock pr…

…ivate.

rvm/src/org/jikesrvm/compilers/opt/bc2ir/BBSet.java

@@ -510,7 +510,7 @@ void finalPass(boolean inlinedSomething) {
             if (DBG_EX || DBG_FLATTEN) {
               db("No (local) handlers were actually reachable for " + curr + "; setting to caller");
             }
-            curr.block.exceptionHandlers = curr.block.exceptionHandlers.getCaller();
+            curr.block.setExceptionHandlers(curr.block.exceptionHandlers().getCaller());
           } else {
             ExceptionHandlerBasicBlock[] nlh =
                 new ExceptionHandlerBasicBlock[curr.handlers.length - notGenerated];
@@ -523,8 +523,7 @@ void finalPass(boolean inlinedSomething) {
                 }
               }
             }
-            curr.block.exceptionHandlers =
-                new ExceptionHandlerBasicBlockBag(nlh, curr.block.exceptionHandlers.getCaller());
+            curr.block.setExceptionHandlers(new ExceptionHandlerBasicBlockBag(nlh, curr.block.exceptionHandlers().getCaller()));
           }
         }
       }
@@ -701,9 +700,9 @@ private void initializeExceptionHandlers(BasicBlockLE bble, Operand[] simLocals)
       for (int i = 0; i < bble.handlers.length; i++) {
         ehbbs[i] = bble.handlers[i].entryBlock;
       }
-      bble.block.exceptionHandlers = new ExceptionHandlerBasicBlockBag(ehbbs, gc.getEnclosingHandlers());
+      bble.block.setExceptionHandlers(new ExceptionHandlerBasicBlockBag(ehbbs, gc.getEnclosingHandlers()));
     } else {
-      bble.block.exceptionHandlers = gc.getEnclosingHandlers();
+      bble.block.setExceptionHandlers(gc.getEnclosingHandlers());
     }
   }
 

rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java

@@ -4697,7 +4697,7 @@ private boolean maybeInlineMethod(InlineDecision inlDec, Instruction callSite) {
     // prevent the opt compiler from inlining a method that contains an
     // unimplemented magic.
     GenerationContext inlinedContext =
-        Inliner.execute(inlDec, gc, currentBBLE.block.exceptionHandlers, callSite);
+        Inliner.execute(inlDec, gc, currentBBLE.block.exceptionHandlers(), callSite);
 
     inlinedSomething = true;
     // TODO: We're currently not keeping track if any of the

rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java

@@ -384,9 +384,9 @@ public GenerationContext createChildContext(ExceptionHandlerBasicBlockBag ebag,
     // Initialize the child CFG, prologue, and epilogue blocks
     child.cfg = new ControlFlowGraph(this.cfg.numberOfNodes());
     child.prologue = new BasicBlock(PROLOGUE_BCI, child.inlineSequence, child.cfg);
-    child.prologue.exceptionHandlers = ebag;
+    child.prologue.setExceptionHandlers(ebag);
     child.epilogue = new BasicBlock(EPILOGUE_BCI, child.inlineSequence, child.cfg);
-    child.epilogue.exceptionHandlers = ebag;
+    child.epilogue.setExceptionHandlers(ebag);
     child.cfg.addLastInCodeOrder(child.prologue);
     child.cfg.addLastInCodeOrder(child.epilogue);
 
@@ -487,9 +487,9 @@ public static GenerationContext createSynthetic(GenerationContext parent, Except
     // and epilogue don't disappear, it was correct to have the
     // parent's position. -- Matt
     child.prologue = new BasicBlock(PROLOGUE_BCI, parent.inlineSequence, parent.cfg);
-    child.prologue.exceptionHandlers = ebag;
+    child.prologue.setExceptionHandlers(ebag);
     child.epilogue = new BasicBlock(EPILOGUE_BCI, parent.inlineSequence, parent.cfg);
-    child.epilogue.exceptionHandlers = ebag;
+    child.epilogue.setExceptionHandlers(ebag);
     child.cfg.addLastInCodeOrder(child.prologue);
     child.cfg.addLastInCodeOrder(child.epilogue);
 
@@ -796,7 +796,7 @@ private void completeExceptionHandlers(boolean isOutermost) {
                                              inlineSequence,
                                              new TypeOperand(RVMType.JavaLangThrowableType),
                                              cfg);
-      rethrow.exceptionHandlers = enclosingHandlers;
+      rethrow.setExceptionHandlers(enclosingHandlers);
       RegisterOperand ceo = temps.makeTemp(TypeReference.JavaLangThrowable);
       Instruction s = Nullary.create(GET_CAUGHT_EXCEPTION, ceo);
       appendInstruction(rethrow, s, SYNTH_CATCH_BCI);

rvm/src/org/jikesrvm/compilers/opt/inlining/Inliner.java

@@ -182,7 +182,7 @@ public static GenerationContext execute(InlineDecision inlDec, GenerationContext
       // Step 4: Create a block to contain a copy of the original call or an OSR_Yieldpoint
       //         to cover the case that all predictions fail.
       BasicBlock testFailed = new BasicBlock(callSite.getBytecodeIndex(), callSite.position(), parent.getCfg());
-      testFailed.exceptionHandlers = ebag;
+      testFailed.setExceptionHandlers(ebag);
 
       if (COUNT_FAILED_GUARDS && Controller.options.INSERT_DEBUGGING_COUNTERS) {
         // Get a dynamic count of how many times guards fail at runtime.
@@ -270,7 +270,7 @@ public static GenerationContext execute(InlineDecision inlDec, GenerationContext
       // "logical" test and to share test insertion for interfaces/virtuals.
       for (int i = children.length - 1; i >= 0; i--, testFailed = firstIfBlock) {
         firstIfBlock = new BasicBlock(callSite.getBytecodeIndex(), callSite.position(), parent.getCfg());
-        firstIfBlock.exceptionHandlers = ebag;
+        firstIfBlock.setExceptionHandlers(ebag);
         BasicBlock lastIfBlock = firstIfBlock;
         RVMMethod target = children[i].getMethod();
         Instruction tmp;
@@ -317,7 +317,7 @@ public static GenerationContext execute(InlineDecision inlDec, GenerationContext
               VM.sysWrite("\t\tRequired additional instanceof " + callDeclClass + " test\n");
             }
             firstIfBlock = new BasicBlock(callSite.getBytecodeIndex(), callSite.position(), parent.getCfg());
-            firstIfBlock.exceptionHandlers = ebag;
+            firstIfBlock.setExceptionHandlers(ebag);
 
             RegisterOperand instanceOfResult = parent.getTemps().makeTempInt();
             tmp =

rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlock.java

@@ -120,7 +120,7 @@ public class BasicBlock extends SortedGraphNode {
    * May be shared if multiple blocks have exactly the same chain
    * of exception handlers.
    */
-  public ExceptionHandlerBasicBlockBag exceptionHandlers;
+  private ExceptionHandlerBasicBlockBag exceptionHandlers;
 
   /**
    * First instruction of the basic block (LABEL).
@@ -2034,4 +2034,12 @@ public void discardInstructions() {
     end.getPrev().setNext(null);
     start.linkWithNext(end);
   }
+
+  public ExceptionHandlerBasicBlockBag exceptionHandlers() {
+    return exceptionHandlers;
+  }
+
+  public void setExceptionHandlers(ExceptionHandlerBasicBlockBag exceptionHandlers) {
+    this.exceptionHandlers = exceptionHandlers;
+  }
 }

rvm/test-src/org/jikesrvm/compilers/opt/bc2ir/GenerationContextTest.java

@@ -1068,11 +1068,11 @@ private void assertThatPrologueAndEpilogueAreWiredCorrectlyForChildContext(
     assertThat(child.getPrologue().firstInstruction().getBytecodeIndex(), is(PROLOGUE_BCI));
     assertThat(child.getPrologue().firstInstruction().position(), is(child.getInlineSequence()));
     assertThat(child.getPrologue().getNumber(), is(nodeNumber));
-    assertThat(child.getPrologue().exceptionHandlers, is(ebag));
+    assertThat(child.getPrologue().exceptionHandlers(), is(ebag));
     assertThat(child.getEpilogue().firstInstruction().getBytecodeIndex(), is(EPILOGUE_BCI));
     assertThat(child.getEpilogue().firstInstruction().position(), is(child.getInlineSequence()));
     assertThat(child.getEpilogue().getNumber(), is(nodeNumber + 1));
-    assertThat(child.getEpilogue().exceptionHandlers, is(ebag));
+    assertThat(child.getEpilogue().exceptionHandlers(), is(ebag));
     int newNodeNumber = nodeNumber + 2;
     assertThat(child.getCfg().numberOfNodes(), is(newNodeNumber));
     assertThat(child.getCfg().firstInCodeOrder(), is(child.getPrologue()));
@@ -1495,7 +1495,7 @@ private void assertThatUnlockAndRethrowBlockIsCorrectForInlinedMethod(Generation
     ExceptionHandlerBasicBlockBag ehbb = childContext.getEnclosingHandlers();
     Enumeration<BasicBlock> enumerator = ehbb.enumerator();
 
-    assertThat(childContext.getUnlockAndRethrow().exceptionHandlers, is(parentContext.getEnclosingHandlers()));
+    assertThat(childContext.getUnlockAndRethrow().exceptionHandlers(), is(parentContext.getEnclosingHandlers()));
 
     ExceptionHandlerBasicBlock rethrow = (ExceptionHandlerBasicBlock) enumerator.nextElement();
     assertSame(rethrow, childContext.getUnlockAndRethrow());
@@ -1708,11 +1708,11 @@ public void contextReturnedByGetSynthethicContextContainsOnlyCFG() throws Except
     assertThat(synthethicContext.getPrologue().firstInstruction().getBytecodeIndex(), is(PROLOGUE_BCI));
     assertThat(synthethicContext.getPrologue().firstInstruction().position(), is(gc.getInlineSequence()));
     assertThat(synthethicContext.getPrologue().getNumber(), is(parentCfgNodeNumber));
-    assertThat(synthethicContext.getPrologue().exceptionHandlers, is(mockEbag));
+    assertThat(synthethicContext.getPrologue().exceptionHandlers(), is(mockEbag));
     assertThat(synthethicContext.getEpilogue().firstInstruction().getBytecodeIndex(), is(EPILOGUE_BCI));
     assertThat(synthethicContext.getEpilogue().firstInstruction().position(), is(gc.getInlineSequence()));
     assertThat(synthethicContext.getEpilogue().getNumber(), is(parentCfgNodeNumber + 1));
-    assertThat(synthethicContext.getEpilogue().exceptionHandlers, is(mockEbag));
+    assertThat(synthethicContext.getEpilogue().exceptionHandlers(), is(mockEbag));
     assertThat(gc.getCfg().numberOfNodes(), is(4));
     assertThat(synthethicContext.getCfg().numberOfNodes(), is(synthethicNodeNumber));
     assertThat(synthethicContext.getCfg().firstInCodeOrder(), is(synthethicContext.getPrologue()));