From 0c6265a5a119293abebffca3f8df09e6a5b0c84d Mon Sep 17 00:00:00 2001 From: amurillo Date: Mon, 13 Jan 2014 16:00:46 -0800 Subject: 8031553: new hotspot build - hs25-b67 Reviewed-by: jcoomes --- make/hotspot_version | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/hotspot_version b/make/hotspot_version index 20df419b1..bca36a9ef 100644 --- a/make/hotspot_version +++ b/make/hotspot_version @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2014, 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 @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2013 +HOTSPOT_VM_COPYRIGHT=Copyright 2014 HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=66 +HS_BUILD_NUMBER=67 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 -- cgit v1.2.3 From 344b5e0bf36a720d5c063e702c369ee9c5520981 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 14 Jan 2014 09:44:45 +0100 Subject: 8028764: dtrace/hotspot_jni/ALL/ALL001 crashes the vm on Solaris-amd64, SIGSEGV in MarkSweep::follow_stack()+0x8a Summary: C1 generates code to encode compressed oop into tmp register before runtime call for patching where GC may happen Reviewed-by: iveresov, twisti, kvn Contributed-by: mgerdin --- src/cpu/x86/vm/c1_LIRAssembler_x86.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp index af1319233..bf9c93473 100644 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @@ -38,6 +38,7 @@ #include "nativeInst_x86.hpp" #include "oops/objArrayKlass.hpp" #include "runtime/sharedRuntime.hpp" +#include "vmreg_x86.inline.hpp" // These masks are used to provide 128-bit aligned bitmasks to the XMM @@ -1006,6 +1007,9 @@ void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch if (UseCompressedOops && !wide) { __ movptr(compressed_src, src->as_register()); __ encode_heap_oop(compressed_src); + if (patch_code != lir_patch_none) { + info->oop_map()->set_narrowoop(compressed_src->as_VMReg()); + } } #endif } -- cgit v1.2.3 From efdaed85b580c670dd336f38f0a2dccc1dcf988a Mon Sep 17 00:00:00 2001 From: twisti Date: Thu, 16 Jan 2014 16:18:34 -0800 Subject: 8022395: java.util.zip.ZipException: Not in GZIP format in JT_JDK/test/java/util/zip/GZIP tests Reviewed-by: kvn, iveresov --- src/cpu/x86/vm/c1_LIRGenerator_x86.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp index 4a30d597b..b4e8223e1 100644 --- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp +++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp @@ -941,6 +941,8 @@ void LIRGenerator::do_update_CRC32(Intrinsic* x) { case vmIntrinsics::_updateCRC32: { LIRItem crc(x->argument_at(0), this); LIRItem val(x->argument_at(1), this); + // val is destroyed by update_crc32 + val.set_destroys_register(); crc.load_item(); val.load_item(); __ update_crc32(crc.result(), val.result(), result); -- cgit v1.2.3 From f6c43aa2e81eb8a8aaee7996aebee938b2e756e4 Mon Sep 17 00:00:00 2001 From: katleman Date: Fri, 17 Jan 2014 15:52:59 -0800 Subject: Added tag jdk8-b124 for changeset df333ee12bba --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 74e670d35..8586dfb07 100644 --- a/.hgtags +++ b/.hgtags @@ -409,3 +409,4 @@ fca262db9c4309f99d2f5542ab0780e45c2f1578 jdk8-b120 d3521d8e562a782f66fc0dfdebeffba2c7e3471d jdk8-b122 591135a7d6f96c0ef281d078cee9a8d8c342d45c jdk8-b123 9b9816164447214f21b06ccf646893c281c76a42 hs25-b66 +df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124 -- cgit v1.2.3 From c432fcbe0fc40807fe95402aa7f348944c515103 Mon Sep 17 00:00:00 2001 From: amurillo Date: Fri, 17 Jan 2014 20:24:30 -0800 Subject: Added tag hs25-b67 for changeset 3585183c191a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8586dfb07..a77078ece 100644 --- a/.hgtags +++ b/.hgtags @@ -410,3 +410,4 @@ d3521d8e562a782f66fc0dfdebeffba2c7e3471d jdk8-b122 591135a7d6f96c0ef281d078cee9a8d8c342d45c jdk8-b123 9b9816164447214f21b06ccf646893c281c76a42 hs25-b66 df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124 +3585183c191aa6b4d0375ea659515335e1804417 hs25-b67 -- cgit v1.2.3