*** old/src/share/vm/interpreter/rewriter.cpp	Thu Dec  3 11:54:28 2009
--- new/src/share/vm/interpreter/rewriter.cpp	Thu Dec  3 11:54:27 2009

*** 245,263 ****
--- 245,270 ----
  }
  
  
  void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) {
    ResourceMark rm(THREAD);
!   Rewriter     rw(klass, klass->constants(), klass->methods(), CHECK);
    // (That's all, folks.)
  }
  
  Rewriter::Rewriter(instanceKlassHandle klass, TRAPS)
+ 
+ void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) {
+   ResourceMark rm(THREAD);
+   Rewriter     rw(klass, cpool, methods, CHECK);
+   // (That's all, folks.)
+ }
+ 
+ 
+ Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS)
    : _klass(klass),
      // gather starting points
      _pool(   THREAD, klass->constants()),
      _methods(THREAD, klass->methods())
+     _pool(cpool),
+     _methods(methods)
  {
    assert(_pool->cache() == NULL, "constant pool cache must not be set yet");
  
    // determine index maps for methodOop rewriting
    compute_index_maps();