src/share/vm/interpreter/templateInterpreter.cpp

changeset 2462
8012aa3ccede
parent 2314
f95d63e2154a
child 2781
e1162778c1c8
     1.1 --- a/src/share/vm/interpreter/templateInterpreter.cpp	Wed Jan 12 13:59:18 2011 -0800
     1.2 +++ b/src/share/vm/interpreter/templateInterpreter.cpp	Thu Jan 13 22:15:41 2011 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -592,7 +592,7 @@
    1.11  //       that do not return "Interpreter::deopt_entry(vtos, 0)"
    1.12  address TemplateInterpreter::deopt_reexecute_entry(methodOop method, address bcp) {
    1.13    assert(method->contains(bcp), "just checkin'");
    1.14 -  Bytecodes::Code code   = Bytecodes::java_code_at(bcp);
    1.15 +  Bytecodes::Code code   = Bytecodes::java_code_at(method, bcp);
    1.16    if (code == Bytecodes::_return) {
    1.17      // This is used for deopt during registration of finalizers
    1.18      // during Object.<init>.  We simply need to resume execution at

mercurial