*** old/src/cpu/x86/vm/templateTable_x86.cpp	Thu Dec 17 17:52:10 2015
--- new/src/cpu/x86/vm/templateTable_x86.cpp	Thu Dec 17 17:52:09 2015

*** 36,47 ****
--- 36,45 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "runtime/synchronizer.hpp"
  #include "utilities/macros.hpp"
  
  #ifndef CC_INTERP
  
  #define __ _masm->
  
  // Global Register Names
  static const Register rbcp     = LP64_ONLY(r13) NOT_LP64(rsi);
  static const Register rlocals  = LP64_ONLY(r14) NOT_LP64(rdi);

*** 4339,4345 ****
--- 4337,4341 ----
    __ lea(rarg, Address(rsp, rax, Interpreter::stackElementScale(), -wordSize));
    call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::multianewarray), rarg);
    __ load_unsigned_byte(rbx, at_bcp(3));
    __ lea(rsp, Address(rsp, rbx, Interpreter::stackElementScale()));  // get rid of counts
  }
  #endif /* !CC_INTERP */