/hg/icedtea8-forest/hotspot: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 967ae4d849eb in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=967ae4d849eb
author: andrew
date: Tue Jul 15 22:55:15 2014 +0100

	PR1869: Avoid x86 workaround when running Zero rather than a JIT
	Contributed-by: Matthias Klose <doko at ubuntu.com>


changeset e7991ccab2ee in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=e7991ccab2ee
author: aph
date: Fri Jan 16 09:15:22 2015 +0100

	6584008, PR2192, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
	Reviewed-by: sla, sspitsyn


changeset 9b0cf2504591 in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=9b0cf2504591
author: sgehwolf
date: Thu Jun 04 03:02:52 2015 +0100

	8074312, PR2253: Enable hotspot builds on 4.x Linux kernels
	Summary: Add "4" to list of allowable versions
	Reviewed-by: dholmes, mikael


diffstat:

 make/linux/Makefile                      |  4 ++--
 src/os/linux/vm/os_linux.cpp             |  2 +-
 src/os_cpu/linux_x86/vm/os_linux_x86.cpp |  2 +-
 src/share/vm/prims/jvmtiTagMap.cpp       |  8 +++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diffs (64 lines):

diff -r 84854c983fd8 -r 9b0cf2504591 make/linux/Makefile
--- a/make/linux/Makefile	Wed May 27 15:22:21 2015 +0100
+++ b/make/linux/Makefile	Thu Jun 04 03:02:52 2015 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -229,7 +229,7 @@
 # Solaris 2.5.1, 2.6).
 # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
 
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
 OS_VERSION := $(shell uname -r)
 EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
 
diff -r 84854c983fd8 -r 9b0cf2504591 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Wed May 27 15:22:21 2015 +0100
+++ b/src/os/linux/vm/os_linux.cpp	Thu Jun 04 03:02:52 2015 +0100
@@ -4861,7 +4861,7 @@
 
   Linux::capture_initial_stack(JavaThread::stack_size_at_create());
 
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
   workaround_expand_exec_shield_cs_limit();
 #endif
 
diff -r 84854c983fd8 -r 9b0cf2504591 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Wed May 27 15:22:21 2015 +0100
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu Jun 04 03:02:52 2015 +0100
@@ -890,7 +890,7 @@
  * updates (JDK-8023956).
  */
 void os::workaround_expand_exec_shield_cs_limit() {
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
   size_t page_size = os::vm_page_size();
   /*
    * Take the highest VA the OS will give us and exec
diff -r 84854c983fd8 -r 9b0cf2504591 src/share/vm/prims/jvmtiTagMap.cpp
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Wed May 27 15:22:21 2015 +0100
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Thu Jun 04 03:02:52 2015 +0100
@@ -1045,10 +1045,16 @@
 {
   assert(str->klass() == SystemDictionary::String_klass(), "not a string");
 
+  typeArrayOop s_value = java_lang_String::value(str);
+
+  // JDK-6584008: the value field may be null if a String instance is
+  // partially constructed.
+  if (s_value == NULL) {
+    return 0;
+  }
   // get the string value and length
   // (string value may be offset from the base)
   int s_len = java_lang_String::length(str);
-  typeArrayOop s_value = java_lang_String::value(str);
   int s_offset = java_lang_String::offset(str);
   jchar* value;
   if (s_len > 0) {