Mercurial > hg > truffle

changeset 20732:cafabb1a240d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 19 Aug 2014 06:06:22 -0700
parents 8210e5f2e21b (diff) be8252a88177 (current diff)
children 6709b033c725
files .hgtags
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 19 05:34:57 2014 -0700
+++ b/.hgtags	Tue Aug 19 06:06:22 2014 -0700
@@ -515,3 +515,4 @@
 9e2bb00a81910776d5b16c49a3f4c5264ceab522 jdk8u25-b11
 2993491d47df8c4b096ea7fa534162bde8b53dcf jdk8u25-b12
 ca6d25be853b5c428c6228871316671843264666 jdk8u25-b13
+5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00
--- a/make/hotspot_version	Tue Aug 19 05:34:57 2014 -0700
+++ b/make/hotspot_version	Tue Aug 19 06:06:22 2014 -0700
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
@@ -31,10 +31,10 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2014
+HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=25
+HS_MINOR_VER=31
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
--- a/src/share/vm/ci/bcEscapeAnalyzer.cpp	Tue Aug 19 05:34:57 2014 -0700
+++ b/src/share/vm/ci/bcEscapeAnalyzer.cpp	Tue Aug 19 06:06:22 2014 -0700
@@ -89,8 +89,8 @@
 public:
   ArgumentMap *_vars;
   ArgumentMap *_stack;
-  short _stack_height;
-  short _max_stack;
+  int _stack_height;
+  int _max_stack;
   bool _initialized;
   ArgumentMap empty_map;