# HG changeset patch
# User Gary Benson <gbenson@redhat.com>
# Date 1236246118 0
# Node ID a737ec21e449424b3ffc8fe24896afcda34f36f3
# Parent  b593d3ef9dce396c5355ea00592750acbd9337a7
2009-03-05  Gary Benson  <gbenson@redhat.com>

	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp
	(SharkInliner::may_be_inlinable): Bail out early on constructors.

diff -r b593d3ef9dce -r a737ec21e449 ChangeLog
--- a/ChangeLog	Wed Mar 04 10:41:13 2009 -0500
+++ b/ChangeLog	Thu Mar 05 09:41:58 2009 +0000
@@ -1,3 +1,8 @@
+2009-03-05  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp
+	(SharkInliner::may_be_inlinable): Bail out early on constructors.
+
 2009-03-04  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkInliner.hpp: New file.
diff -r b593d3ef9dce -r a737ec21e449 ports/hotspot/src/share/vm/shark/sharkInliner.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkInliner.cpp	Wed Mar 04 10:41:13 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkInliner.cpp	Thu Mar 05 09:41:58 2009 +0000
@@ -226,7 +226,15 @@
   if (target->has_exception_handlers() || target->has_jsrs())
     return false;
 
+  // Don't try to inline constructors, as they must
+  // eventually call Object.<init> which we can't inline.
+  // Note that this catches <clinit> too, but why would
+  // we be compiling that?
+  if (target->is_initializer())
+    return false;
+
   // Mustn't inline Object.<init>
+  // Should be caught by the above, but just in case...
   if (target->intrinsic_id() == vmIntrinsics::_Object_init)
     return false;