src/share/vm/runtime/arguments.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 3028,3046 ****
      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
        warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
      }
      ScavengeRootsInCode = 1;
    }
- #ifdef COMPILER2
-   if (EnableInvokeDynamic && DoEscapeAnalysis) {
-     // TODO: We need to find rules for invokedynamic and EA.  For now,
-     // simply disable EA by default.
-     if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
-       DoEscapeAnalysis = false;
-     }
-   }
- #endif
  
    if (PrintGCDetails) {
      // Turn on -verbose:gc options as well
      PrintGC = true;
    }
--- 3028,3037 ----