[MERGE FOR REVIEW] HotSpot 23.25-b01 Merge

[Omair Majid]

On 09/12/2013 02:44 PM, Omair Majid wrote:
> One concern, though (not that it needs to be resolved right now, but I
> figured I would point it out anyway):
> 
> In current hotspot at jdk6, src/share/vm/runtime/globals.hpp contains
> this bit:
> 
> experimental(bool, EnableInvokeDynamic, false,
>             "recognize the invokedynamic instruction")
> 
> This disables JSR292 support, if I am reading this correctly. The new
> hotspot enables it:
> 
>   diagnostic(bool, EnableInvokeDynamic, true,
>           "support JSR 292 (method handles, invokedynamic,"
>           "anonymous classes")
> 
> For compatibility with Java 6, shouldn't this be kept disabled?

Chris Phillips just pointed out on IRC that this is taken care of inside
hotspot already:

http://hg.openjdk.java.net/jdk6/jdk6/hotspot/file/c827c62f66e4/src/share/vm/runtime/arguments.cpp
line 3070:

>   // JSR 292 is not supported before 1.7
>   if (!JDK_Version::is_gte_jdk17x_version()) {
>     if (EnableInvokeDynamic) {
>       if (!FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
>         warning("JSR 292 is not supported before 1.7.  Disabling support.");
>       }
>       EnableInvokeDynamic = false;
>     }
>   }

Sorry for the false alarm.

Omair
-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681