# HG changeset patch
# User kvn
# Date 1328023083 28800
# Node ID de5e87f50b2d06e8454b2071c1e58ba8c3550651
# Parent  e369165faf7a064f8d2f0599aa649f9b87acf473
7140924: SIGSEGV in compiled code for sun.awt.X11.XDecoratedPeer.updateMinSizeHints
Summary: Use unknown_obj instead of empty_map for NULL or Constant Pool object constants in bytecode Escape Analyzer.
Reviewed-by: iveresov, never

diff -r e369165faf7a -r de5e87f50b2d hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
--- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp	Mon Jan 30 19:37:14 2012 -0800
+++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp	Tue Jan 31 07:18:03 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, 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
@@ -359,7 +359,7 @@
       case Bytecodes::_nop:
         break;
       case Bytecodes::_aconst_null:
-        state.apush(empty_map);
+        state.apush(unknown_obj);
         break;
       case Bytecodes::_iconst_m1:
       case Bytecodes::_iconst_0:
@@ -392,6 +392,8 @@
         if (tag.is_long() || tag.is_double()) {
           // Only longs and doubles use 2 stack slots.
           state.lpush();
+        } else if (tag.basic_type() == T_OBJECT) {
+          state.apush(unknown_obj);
         } else {
           state.spush();
         }