--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -33,6 +33,7 @@
#include "compiler/disassembler.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_aarch64.hpp"
+#include "oops/klass.inline.hpp"
#include "opto/compile.hpp"
#include "opto/node.hpp"
#include "runtime/biasedLocking.hpp"
--- a/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -27,6 +27,7 @@
#include "asm/assembler.inline.hpp"
#include "code/relocInfo.hpp"
#include "nativeInst_ppc.hpp"
+#include "oops/klass.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/safepoint.hpp"
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -30,6 +30,7 @@
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
+#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/cpu/sparc/vm/relocInfo_sparc.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/cpu/sparc/vm/relocInfo_sparc.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -26,6 +26,7 @@
#include "asm/assembler.hpp"
#include "code/relocInfo.hpp"
#include "nativeInst_sparc.hpp"
+#include "oops/klass.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/safepoint.hpp"
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -31,6 +31,7 @@
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
+#include "oops/klass.inline.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/cpu/x86/vm/relocInfo_x86.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/cpu/x86/vm/relocInfo_x86.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -26,6 +26,7 @@
#include "asm/macroAssembler.hpp"
#include "code/relocInfo.hpp"
#include "nativeInst_x86.hpp"
+#include "oops/klass.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/safepoint.hpp"
--- a/hotspot/src/os/aix/vm/os_aix.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/os/aix/vm/os_aix.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -1655,13 +1655,6 @@
}
void os::pd_print_cpu_info(outputStream* st, char* buf, size_t buflen) {
- // cpu
- st->print("CPU:");
- st->print("total %d", os::processor_count());
- // It's not safe to query number of active processors after crash
- // st->print("(active %d)", os::active_processor_count());
- st->print(" %s", VM_Version::cpu_features());
- st->cr();
}
void os::print_siginfo(outputStream* st, void* siginfo) {
@@ -3483,7 +3476,6 @@
// For now UseLargePages is just ignored.
FLAG_SET_ERGO(bool, UseLargePages, false);
_page_sizes[0] = 0;
- _large_page_size = -1;
// debug trace
trcVerbose("os::vm_page_size %s\n", describe_pagesize(os::vm_page_size()));
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -2023,10 +2023,10 @@
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;
--- a/hotspot/src/share/vm/gc/g1/g1Allocator.hpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1Allocator.hpp Fri Jul 17 15:01:09 2015 -0700
@@ -44,52 +44,52 @@
size_t _summary_bytes_used;
public:
- G1Allocator(G1CollectedHeap* heap) :
- _g1h(heap), _summary_bytes_used(0) { }
+ G1Allocator(G1CollectedHeap* heap) :
+ _g1h(heap), _summary_bytes_used(0) { }
- static G1Allocator* create_allocator(G1CollectedHeap* g1h);
+ static G1Allocator* create_allocator(G1CollectedHeap* g1h);
- virtual void init_mutator_alloc_region() = 0;
- virtual void release_mutator_alloc_region() = 0;
+ virtual void init_mutator_alloc_region() = 0;
+ virtual void release_mutator_alloc_region() = 0;
- virtual void init_gc_alloc_regions(EvacuationInfo& evacuation_info) = 0;
- virtual void release_gc_alloc_regions(EvacuationInfo& evacuation_info) = 0;
- virtual void abandon_gc_alloc_regions() = 0;
+ virtual void init_gc_alloc_regions(EvacuationInfo& evacuation_info) = 0;
+ virtual void release_gc_alloc_regions(EvacuationInfo& evacuation_info) = 0;
+ virtual void abandon_gc_alloc_regions() = 0;
- virtual MutatorAllocRegion* mutator_alloc_region(AllocationContext_t context) = 0;
- virtual SurvivorGCAllocRegion* survivor_gc_alloc_region(AllocationContext_t context) = 0;
- virtual OldGCAllocRegion* old_gc_alloc_region(AllocationContext_t context) = 0;
- virtual size_t used() = 0;
- virtual bool is_retained_old_region(HeapRegion* hr) = 0;
+ virtual MutatorAllocRegion* mutator_alloc_region(AllocationContext_t context) = 0;
+ virtual SurvivorGCAllocRegion* survivor_gc_alloc_region(AllocationContext_t context) = 0;
+ virtual OldGCAllocRegion* old_gc_alloc_region(AllocationContext_t context) = 0;
+ virtual size_t used() = 0;
+ virtual bool is_retained_old_region(HeapRegion* hr) = 0;
- void reuse_retained_old_region(EvacuationInfo& evacuation_info,
- OldGCAllocRegion* old,
- HeapRegion** retained);
+ void reuse_retained_old_region(EvacuationInfo& evacuation_info,
+ OldGCAllocRegion* old,
+ HeapRegion** retained);
- size_t used_unlocked() const {
- return _summary_bytes_used;
- }
+ size_t used_unlocked() const {
+ return _summary_bytes_used;
+ }
- void increase_used(size_t bytes) {
- _summary_bytes_used += bytes;
- }
+ void increase_used(size_t bytes) {
+ _summary_bytes_used += bytes;
+ }
- void decrease_used(size_t bytes) {
- assert(_summary_bytes_used >= bytes,
- err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
- _summary_bytes_used, bytes));
- _summary_bytes_used -= bytes;
- }
+ void decrease_used(size_t bytes) {
+ assert(_summary_bytes_used >= bytes,
+ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
+ _summary_bytes_used, bytes));
+ _summary_bytes_used -= bytes;
+ }
- void set_used(size_t bytes) {
- _summary_bytes_used = bytes;
- }
+ void set_used(size_t bytes) {
+ _summary_bytes_used = bytes;
+ }
- virtual HeapRegion* new_heap_region(uint hrs_index,
- G1BlockOffsetSharedArray* sharedOffsetArray,
- MemRegion mr) {
- return new HeapRegion(hrs_index, sharedOffsetArray, mr);
- }
+ virtual HeapRegion* new_heap_region(uint hrs_index,
+ G1BlockOffsetSharedArray* sharedOffsetArray,
+ MemRegion mr) {
+ return new HeapRegion(hrs_index, sharedOffsetArray, mr);
+ }
};
// The default allocator for G1.
--- a/hotspot/src/share/vm/runtime/rframe.cpp Fri Jul 17 08:46:52 2015 -0700
+++ b/hotspot/src/share/vm/runtime/rframe.cpp Fri Jul 17 15:01:09 2015 -0700
@@ -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 @@
: 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 @@
} else {
assert(false, "Unhandled frame type");
}
- rf->set_distance(dist);
- rf->init();
+ if (rf != NULL) {
+ rf->set_distance(dist);
+ rf->init();
+ }
return rf;
}