Print this page
rev 1081 : imported patch indy-cleanup-6893081.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/runtime/arguments.cpp
          +++ new/src/share/vm/runtime/arguments.cpp
↓ open down ↓ 2691 lines elided ↑ open up ↑
2692 2692        warning("forcing AnonymousClasses true because EnableMethodHandles is true");
2693 2693      }
2694 2694      AnonymousClasses = true;
2695 2695    }
2696 2696    if ((EnableMethodHandles || AnonymousClasses) && ScavengeRootsInCode == 0) {
2697 2697      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
2698 2698        warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
2699 2699      }
2700 2700      ScavengeRootsInCode = 1;
2701 2701    }
     2702 +#ifdef COMPILER2
     2703 +  if (EnableInvokeDynamic && DoEscapeAnalysis) {
     2704 +    // TODO: We need to find rules for invokedynamic and EA.  For now,
     2705 +    // simply disable EA by default.
     2706 +    if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
     2707 +      DoEscapeAnalysis = false;
     2708 +    }
     2709 +  }
     2710 +#endif
2702 2711  
2703 2712    if (PrintGCDetails) {
2704 2713      // Turn on -verbose:gc options as well
2705 2714      PrintGC = true;
2706 2715      if (FLAG_IS_DEFAULT(TraceClassUnloading)) {
2707 2716        TraceClassUnloading = true;
2708 2717      }
2709 2718    }
2710 2719  
2711 2720  #if defined(_LP64) && defined(COMPILER1)
↓ open down ↓ 3 lines elided ↑ open up ↑
2715 2724  #ifdef SERIALGC
2716 2725    force_serial_gc();
2717 2726  #endif // SERIALGC
2718 2727  #ifdef KERNEL
2719 2728    no_shared_spaces();
2720 2729  #endif // KERNEL
2721 2730  
2722 2731    // Set flags based on ergonomics.
2723 2732    set_ergonomics_flags();
2724 2733  
     2734 +#ifdef _LP64
     2735 +  // XXX JSR 292 currently does not support compressed oops.
     2736 +  if (EnableMethodHandles && UseCompressedOops) {
     2737 +    if (FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops)) {
     2738 +      UseCompressedOops = false;
     2739 +    }
     2740 +  }
     2741 +#endif // _LP64
     2742 +
2725 2743    // Check the GC selections again.
2726 2744    if (!check_gc_consistency()) {
2727 2745      return JNI_EINVAL;
2728 2746    }
2729 2747  
2730 2748    if (UseConcMarkSweepGC) {
2731 2749      // Set flags for CMS and ParNew.  Check UseConcMarkSweep first
2732 2750      // to ensure that when both UseConcMarkSweepGC and UseParNewGC
2733 2751      // are true, we don't call set_parnew_gc_flags() as well.
2734 2752      set_cms_and_parnew_gc_flags();
↓ open down ↓ 221 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX