Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 11111:dec841e0c9aa
8016749: -XX:+UseISM fails an assert(obj->is_oop()) when running SPECjbb2005
Summary: Remove obsolete code that relates to ISM which was used only on Solaris 8.
Reviewed-by: kvn, twisti
author | anoll |
---|---|
date | Wed, 10 Jul 2013 13:33:56 -0700 |
parents | 7ac80525ece9 |
children | ec173c8f3739 |
comparison
equal
deleted
inserted
replaced
11110:5f533e38e7d5 | 11111:dec841e0c9aa |
---|---|
259 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 259 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
260 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 260 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
261 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 261 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
262 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 262 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
263 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 263 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
264 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | |
265 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | |
266 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | |
264 #ifdef PRODUCT | 267 #ifdef PRODUCT |
265 { "DesiredMethodLimit", | 268 { "DesiredMethodLimit", |
266 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, | 269 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, |
267 #endif // PRODUCT | 270 #endif // PRODUCT |
268 { NULL, JDK_Version(0), JDK_Version(0) } | 271 { NULL, JDK_Version(0), JDK_Version(0) } |
2965 // No longer used. | 2968 // No longer used. |
2966 } else if (match_option(option, "-XX:+UseTLE", &tail)) { | 2969 } else if (match_option(option, "-XX:+UseTLE", &tail)) { |
2967 FLAG_SET_CMDLINE(bool, UseTLAB, true); | 2970 FLAG_SET_CMDLINE(bool, UseTLAB, true); |
2968 } else if (match_option(option, "-XX:-UseTLE", &tail)) { | 2971 } else if (match_option(option, "-XX:-UseTLE", &tail)) { |
2969 FLAG_SET_CMDLINE(bool, UseTLAB, false); | 2972 FLAG_SET_CMDLINE(bool, UseTLAB, false); |
2970 SOLARIS_ONLY( | |
2971 } else if (match_option(option, "-XX:+UsePermISM", &tail)) { | |
2972 warning("-XX:+UsePermISM is obsolete."); | |
2973 FLAG_SET_CMDLINE(bool, UseISM, true); | |
2974 } else if (match_option(option, "-XX:-UsePermISM", &tail)) { | |
2975 FLAG_SET_CMDLINE(bool, UseISM, false); | |
2976 ) | |
2977 } else if (match_option(option, "-XX:+DisplayVMOutputToStderr", &tail)) { | 2973 } else if (match_option(option, "-XX:+DisplayVMOutputToStderr", &tail)) { |
2978 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, false); | 2974 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, false); |
2979 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true); | 2975 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true); |
2980 } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) { | 2976 } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) { |
2981 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); | 2977 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); |
3144 MaxHeapSize < LargePageHeapSizeThreshold) { | 3140 MaxHeapSize < LargePageHeapSizeThreshold) { |
3145 // No need for large granularity pages w/small heaps. | 3141 // No need for large granularity pages w/small heaps. |
3146 // Note that large pages are enabled/disabled for both the | 3142 // Note that large pages are enabled/disabled for both the |
3147 // Java heap and the code cache. | 3143 // Java heap and the code cache. |
3148 FLAG_SET_DEFAULT(UseLargePages, false); | 3144 FLAG_SET_DEFAULT(UseLargePages, false); |
3149 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseMPSS, false)); | |
3150 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false)); | |
3151 } | 3145 } |
3152 | 3146 |
3153 // Tiered compilation is undefined with C1. | 3147 // Tiered compilation is undefined with C1. |
3154 TieredCompilation = false; | 3148 TieredCompilation = false; |
3155 #else | 3149 #else |