Print this page
rev 1024 : 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 ↓ 2658 lines elided ↑ open up ↑
2659 2659        warning("forcing AnonymousClasses true because EnableMethodHandles is true");
2660 2660      }
2661 2661      AnonymousClasses = true;
2662 2662    }
2663 2663    if ((EnableMethodHandles || AnonymousClasses) && ScavengeRootsInCode == 0) {
2664 2664      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
2665 2665        warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
2666 2666      }
2667 2667      ScavengeRootsInCode = 1;
2668 2668    }
     2669 +#ifdef COMPILER2
     2670 +  if (EnableInvokeDynamic && DoEscapeAnalysis) {
     2671 +    // TODO: We need to find rules for invokedynamic and EA.  For now,
     2672 +    // simply disable EA by default.
     2673 +    if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
     2674 +      DoEscapeAnalysis = false;
     2675 +    }
     2676 +  }
     2677 +#endif
2669 2678  
2670 2679    if (PrintGCDetails) {
2671 2680      // Turn on -verbose:gc options as well
2672 2681      PrintGC = true;
2673 2682      if (FLAG_IS_DEFAULT(TraceClassUnloading)) {
2674 2683        TraceClassUnloading = true;
2675 2684      }
2676 2685    }
2677 2686  
2678 2687  #ifdef SERIALGC
2679 2688    set_serial_gc_flags();
2680 2689  #endif // SERIALGC
2681 2690  #ifdef KERNEL
2682 2691    no_shared_spaces();
2683 2692  #endif // KERNEL
2684 2693  
2685 2694    // Set flags based on ergonomics.
2686 2695    set_ergonomics_flags();
2687 2696  
     2697 +#ifdef _LP64
     2698 +  // XXX JSR 292 currently does not support compressed oops.
     2699 +  if (EnableMethodHandles && UseCompressedOops) {
     2700 +    if (FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops)) {
     2701 +      UseCompressedOops = false;
     2702 +    }
     2703 +  }
     2704 +#endif // _LP64
     2705 +
2688 2706    // Check the GC selections again.
2689 2707    if (!check_gc_consistency()) {
2690 2708      return JNI_EINVAL;
2691 2709    }
2692 2710  
2693 2711    if (UseParallelGC || UseParallelOldGC) {
2694 2712      // Set some flags for ParallelGC if needed.
2695 2713      set_parallel_gc_flags();
2696 2714    } else if (UseConcMarkSweepGC) {
2697 2715      // Set some flags for CMS
↓ open down ↓ 217 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX