stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Coleen Phillimore 2015-07-18 01:55:38 +02:00
commit 802d5def62
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotspot/src/share/vm/classfile/classFileParser.cpp
View File

@ -2023,10 +2023,10 @@ methodHandle ClassFileParser::parse_method(bool is_interface,
bool lvt_allocated = false;
u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER;
u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER;
u2* localvariable_table_length;
u2** localvariable_table_start;
u2* localvariable_type_table_length;
u2** localvariable_type_table_start;
u2* localvariable_table_length = NULL;
u2** localvariable_table_start = NULL;
u2* localvariable_type_table_length = NULL;
u2** localvariable_type_table_start = NULL;
int method_parameters_length = -1;
u1* method_parameters_data = NULL;
bool method_parameters_seen = false;

10
hotspot/src/share/vm/runtime/rframe.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -81,7 +81,7 @@ DeoptimizedRFrame::DeoptimizedRFrame(frame fr, JavaThread* thread, RFrame*const
: InterpretedRFrame(fr, thread, callee) {}
RFrame* RFrame::new_RFrame(frame fr, JavaThread* thread, RFrame*const callee) {
RFrame* rf;
RFrame* rf = NULL;
int dist = callee ? callee->distance() : -1;
if (fr.is_interpreted_frame()) {
rf = new InterpretedRFrame(fr, thread, callee);
@ -93,8 +93,10 @@ RFrame* RFrame::new_RFrame(frame fr, JavaThread* thread, RFrame*const callee) {
} else {
assert(false, "Unhandled frame type");
}
rf->set_distance(dist);
rf->init();
if (rf != NULL) {
rf->set_distance(dist);
rf->init();
}
return rf;
}