Fridrich Strba 2016-05-26 21:37:54 +00:00 committed by Git OBS Bridge
parent 0f7288da69
commit e5f67e74a4

View File

@ -2016,6 +2016,18 @@
}
}
--- openjdk/hotspot/src/share/vm/opto/node.cpp 2016-02-16 08:11:33.000000000 +0100
+++ openjdk/hotspot/src/share/vm/opto/node.cpp 2016-05-26 23:23:12.204803196 +0200
@@ -325,6 +325,9 @@
// Create a Node, with a given number of required edges.
Node::Node(uint req)
: _idx(IDX_INIT(req))
+#ifdef ASSERT
+ , _parse_idx(_idx)
+#endif
{
assert( req < Compile::current()->max_node_limit() - NodeLimitFudgeFactor, "Input limit exceeded" );
debug_only( verify_construction() );
--- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2016-02-16 08:11:33.000000000 +0100
+++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2016-05-26 17:41:49.547683485 +0200
@@ -1321,27 +1321,27 @@
@ -2517,7 +2529,6 @@
};
JNINativeMethod fence_methods[] = {
Only in openjdk/hotspot/src/share/vm/prims: unsafe.cpp.bak
--- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-02-16 08:11:33.000000000 +0100
+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-05-26 13:07:57.251597177 +0200
@@ -987,7 +987,7 @@