# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1354612165 -3600
# Node ID e9fe9d3d94ace283df1cfde51770f69d859e8531
# Parent  ceb8c5b294199ab1fa1e279b08e5238554f136af
re-enabled inlining of polymorphic calls with more than 2 receiver types

diff -r ceb8c5b29419 -r e9fe9d3d94ac src/cpu/x86/vm/c1_globals_x86.hpp
--- a/src/cpu/x86/vm/c1_globals_x86.hpp	Mon Dec 03 13:44:12 2012 +0100
+++ b/src/cpu/x86/vm/c1_globals_x86.hpp	Tue Dec 04 10:09:25 2012 +0100
@@ -44,7 +44,6 @@
 define_pd_global(intx, FreqInlineSize,               325  );
 define_pd_global(intx, NewSizeThreadIncrease,        4*K  );
 define_pd_global(uintx,MetaspaceSize,                12*M );
-define_pd_global(uintx,MaxPermSize,                  64*M );
 define_pd_global(bool, NeverActAsServerClassMachine, true );
 define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 define_pd_global(bool, CICompileOSR,                 true );
diff -r ceb8c5b29419 -r e9fe9d3d94ac src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Mon Dec 03 13:44:12 2012 +0100
+++ b/src/share/vm/runtime/globals.hpp	Tue Dec 04 10:09:25 2012 +0100
@@ -2910,7 +2910,7 @@
           "if non-zero, start verifying C heap after Nth call to "          \
           "malloc/realloc/free")                                            \
                                                                             \
-  product(intx, TypeProfileWidth,     2,                                   \
+  product_pd(intx, TypeProfileWidth,                                        \
           "number of receiver types to record in call/cast profile")        \
                                                                             \
   develop(intx, BciProfileWidth,      2,                                    \