Print this page


Split Close
Expand all
Collapse all
          --- old/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
          +++ new/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
↓ open down ↓ 1519 lines elided ↑ open up ↑
1520 1520    // the extra locals.
1521 1521  
1522 1522  
1523 1523    int size = overhead +
1524 1524           ((callee_locals - callee_param_count)*Interpreter::stackElementWords) +
1525 1525           (moncount*frame::interpreter_frame_monitor_size()) +
1526 1526           tempcount*Interpreter::stackElementWords + popframe_extra_args;
1527 1527  
1528 1528    if (interpreter_frame != NULL) {
1529 1529  #ifdef ASSERT
1530      -    if (!EnableMethodHandles)
     1530 +    if (!EnableInvokeDynamic)
1531 1531        // @@@ FIXME: Should we correct interpreter_frame_sender_sp in the calling sequences?
1532 1532        // Probably, since deoptimization doesn't work yet.
1533 1533        assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
1534 1534      assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable(2)");
1535 1535  #endif
1536 1536  
1537 1537      interpreter_frame->interpreter_frame_set_method(method);
1538 1538      // NOTE the difference in using sender_sp and interpreter_frame_sender_sp
1539 1539      // interpreter_frame_sender_sp is the original sp of the caller (the unextended_sp)
1540 1540      // and sender_sp is fp+8
↓ open down ↓ 328 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX