Remove legacy JsInterop.

Change-Id: I06a45921eb574ab86647c364d433abe04ea4f0a8
gwtproject · Jan 19, 2016 · dd141d6 · dd141d6
1 parent 3012068
commit dd141d6
Show file tree

Hide file tree

Showing 32 changed files with 86 additions and 628 deletions.
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
@@ -20,7 +20,6 @@
 import com.google.gwt.dev.cfg.Properties;
 import com.google.gwt.dev.jjs.JsOutputOption;
 import com.google.gwt.dev.js.JsNamespaceOption;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.OptionOptimize;
 import com.google.gwt.dev.util.arg.SourceLevel;
@@ -42,7 +41,6 @@ class CompilerOptionsImpl extends UnmodifiableCompilerOptions {
   private final TreeLogger.Type logLevel;
   private final List<String> moduleNames;
   private final SourceLevel sourceLevel;
-  private final OptionJsInteropMode.Mode jsInteropMode;
   private final boolean generateJsInteropExports;
   private final OptionMethodNameDisplayMode.Mode methodNameDisplayMode;
   private final ListMultimap<String, String> properties;
@@ -56,7 +54,6 @@ class CompilerOptionsImpl extends UnmodifiableCompilerOptions {
     this.sourceLevel = options.getSourceLevel();
     this.failOnError = options.isFailOnError();
     this.logLevel = options.getLogLevel();
-    this.jsInteropMode = options.getJsInteropMode();
     this.generateJsInteropExports = options.shouldGenerateJsInteropExports();
     this.methodNameDisplayMode = options.getMethodNameDisplayMode();
     this.properties = LinkedListMultimap.create(options.getProperties());
@@ -94,11 +91,6 @@ public File getGenDir() {
     return compileDir.getGenDir();
   }
 
-  @Override
-  public OptionJsInteropMode.Mode getJsInteropMode() {
-    return jsInteropMode;
-  }
-
   @Override
   public boolean shouldGenerateJsInteropExports() {
     return generateJsInteropExports;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -23,7 +23,6 @@
 import com.google.gwt.dev.util.arg.ArgHandlerClosureFormattedOutput;
 import com.google.gwt.dev.util.arg.ArgHandlerGenerateJsInteropExports;
 import com.google.gwt.dev.util.arg.ArgHandlerIncrementalCompile;
-import com.google.gwt.dev.util.arg.ArgHandlerJsInteropMode;
 import com.google.gwt.dev.util.arg.ArgHandlerLogLevel;
 import com.google.gwt.dev.util.arg.ArgHandlerMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.ArgHandlerScriptStyle;
@@ -32,7 +31,6 @@
 import com.google.gwt.dev.util.arg.OptionClosureFormattedOutput;
 import com.google.gwt.dev.util.arg.OptionGenerateJsInteropExports;
 import com.google.gwt.dev.util.arg.OptionIncrementalCompile;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode;
 import com.google.gwt.dev.util.arg.OptionLogLevel;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.OptionScriptStyle;
@@ -88,7 +86,6 @@ public class Options {
   private SourceLevel sourceLevel = SourceLevel.DEFAULT_SOURCE_LEVEL;
   private boolean failOnError = false;
   private int compileTestRecompiles = 0;
-  private OptionJsInteropMode.Mode jsInteropMode = OptionJsInteropMode.Mode.JS_RC;
   private boolean generateJsInteropExports = false;
   private OptionMethodNameDisplayMode.Mode methodNameDisplayMode =
       OptionMethodNameDisplayMode.Mode.NONE;
@@ -305,10 +302,6 @@ boolean isFailOnError() {
     return failOnError;
   }
 
-  OptionJsInteropMode.Mode getJsInteropMode() {
-    return jsInteropMode;
-  }
-
   boolean shouldGenerateJsInteropExports() {
     return generateJsInteropExports;
   }
@@ -399,16 +392,6 @@ public void setLogLevel(TreeLogger.Type logLevel) {
           Options.this.logLevel = logLevel;
         }
       }));
-      registerHandler(new ArgHandlerJsInteropMode(new OptionJsInteropMode() {
-        @Override
-        public OptionJsInteropMode.Mode getJsInteropMode() {
-          return Options.this.jsInteropMode;
-        }
-
-        @Override
-        public void setJsInteropMode(OptionJsInteropMode.Mode mode) {
-          Options.this.jsInteropMode = mode;
-        }}));
       registerHandler(new ArgHandlerGenerateJsInteropExports(new OptionGenerateJsInteropExports() {
         @Override
         public boolean shouldGenerateJsInteropExports() {

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java
@@ -21,7 +21,6 @@
 import com.google.gwt.dev.cfg.Properties;
 import com.google.gwt.dev.jjs.JsOutputOption;
 import com.google.gwt.dev.js.JsNamespaceOption;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.SourceLevel;
 
@@ -120,11 +119,6 @@ public void setInlineLiteralParameters(boolean inlineLiteralParameters) {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public void setJsInteropMode(OptionJsInteropMode.Mode mode) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void setGenerateJsInteropExports(boolean generateExports) {
     throw new UnsupportedOperationException();

diff --git a/dev/core/src/com/google/gwt/dev/DevMode.java b/dev/core/src/com/google/gwt/dev/DevMode.java
@@ -37,7 +37,6 @@
 import com.google.gwt.dev.util.arg.ArgHandlerExtraDir;
 import com.google.gwt.dev.util.arg.ArgHandlerGenerateJsInteropExports;
 import com.google.gwt.dev.util.arg.ArgHandlerIncrementalCompile;
-import com.google.gwt.dev.util.arg.ArgHandlerJsInteropMode;
 import com.google.gwt.dev.util.arg.ArgHandlerMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.ArgHandlerModuleName;
 import com.google.gwt.dev.util.arg.ArgHandlerModulePathPrefix;
@@ -247,7 +246,6 @@ public ArgProcessor(HostedModeOptions options) {
       registerHandler(new ArgHandlerDisableUpdateCheck(options));
       registerHandler(new ArgHandlerMethodNameDisplayMode(options));
       registerHandler(new ArgHandlerSourceLevel(options));
-      registerHandler(new ArgHandlerJsInteropMode(options));
       registerHandler(new ArgHandlerGenerateJsInteropExports(options));
       registerHandler(new ArgHandlerIncrementalCompile(options));
       registerHandler(new ArgHandlerModuleName(options) {

diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java
@@ -39,7 +39,6 @@
 import com.google.gwt.dev.util.arg.ArgHandlerGenDir;
 import com.google.gwt.dev.util.arg.ArgHandlerGenerateJsInteropExports;
 import com.google.gwt.dev.util.arg.ArgHandlerIncrementalCompileWarnings;
-import com.google.gwt.dev.util.arg.ArgHandlerJsInteropMode;
 import com.google.gwt.dev.util.arg.ArgHandlerJsonSoyc;
 import com.google.gwt.dev.util.arg.ArgHandlerMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.ArgHandlerMissingDepsFile;
@@ -81,7 +80,6 @@ public PrecompileTaskArgProcessor(PrecompileTaskOptions options) {
     registerHandler(new ArgHandlerFragmentMerge(options));
     registerHandler(new ArgHandlerGenDir(options));
     registerHandler(new ArgHandlerIncrementalCompileWarnings());
-    registerHandler(new ArgHandlerJsInteropMode(options));
     registerHandler(new ArgHandlerGenerateJsInteropExports(options));
     registerHandler(new ArgHandlerMethodNameDisplayMode(options));
     registerHandler(new ArgHandlerMissingDepsFile());

diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
@@ -20,7 +20,6 @@
 import com.google.gwt.dev.jjs.JJSOptionsImpl;
 import com.google.gwt.dev.jjs.JsOutputOption;
 import com.google.gwt.dev.js.JsNamespaceOption;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.SourceLevel;
 import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
@@ -90,11 +89,6 @@ public File getGenDir() {
     return genDir;
   }
 
-  @Override
-  public OptionJsInteropMode.Mode getJsInteropMode() {
-    return jjsOptions.getJsInteropMode();
-  }
-
   @Override
   public boolean shouldGenerateJsInteropExports() {
     return jjsOptions.shouldGenerateJsInteropExports();
@@ -274,11 +268,6 @@ public void setInlineLiteralParameters(boolean enabled) {
     jjsOptions.setInlineLiteralParameters(enabled);
   }
 
-  @Override
-  public void setJsInteropMode(OptionJsInteropMode.Mode mode) {
-    jjsOptions.setJsInteropMode(mode);
-  }
-
   @Override
   public void setGenerateJsInteropExports(boolean generateExports) {
     jjsOptions.setGenerateJsInteropExports(generateExports);

diff --git a/dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java b/dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java
@@ -16,11 +16,9 @@
 package com.google.gwt.dev.javac;
 
 import com.google.gwt.dev.jjs.ast.HasJsInfo.JsMemberType;
-import com.google.gwt.dev.jjs.ast.JClassType;
 import com.google.gwt.dev.jjs.ast.JConstructor;
 import com.google.gwt.dev.jjs.ast.JDeclaredType;
 import com.google.gwt.dev.jjs.ast.JField;
-import com.google.gwt.dev.jjs.ast.JInterfaceType;
 import com.google.gwt.dev.jjs.ast.JMember;
 import com.google.gwt.dev.jjs.ast.JMethod;
 import com.google.gwt.dev.jjs.ast.JPrimitiveType;
@@ -32,43 +30,14 @@
  * Utility functions to interact with JDT classes for JsInterop.
  */
 public final class JsInteropUtil {
-
-  public static final String JSEXPORT_CLASS = "com.google.gwt.core.client.js.JsExport";
-  public static final String JSFUNCTION_CLASS = "com.google.gwt.core.client.js.JsFunction";
-  public static final String JSNAMESPACE_CLASS = "com.google.gwt.core.client.js.JsNamespace";
-  public static final String JSNOEXPORT_CLASS = "com.google.gwt.core.client.js.JsNoExport";
-  public static final String JSPROPERTY_CLASS = "com.google.gwt.core.client.js.JsProperty";
-  public static final String JSTYPE_CLASS = "com.google.gwt.core.client.js.JsType";
   public static final String UNUSABLE_BY_JS = "unusable-by-js";
   public static final String INVALID_JSNAME = "<invalid>";
 
   public static boolean isGlobal(String jsNamespace) {
     return "<global>".equals(jsNamespace);
   }
 
-  public static void maybeSetJsInteropProperties(JDeclaredType type, Annotation... annotations) {
+  public static void maybeSetJsInteropProperties(JDeclaredType type, Annotation[] annotations) {
-    AnnotationBinding jsType = JdtUtil.getAnnotation(annotations, JSTYPE_CLASS);
-    String namespace = maybeGetJsNamespace(annotations);
-    String exportName = maybeGetJsExportName(annotations);
-    String jsPrototype = JdtUtil.getAnnotationParameterString(jsType, "prototype");
-    boolean isJsNative = jsPrototype != null;
-    if (isJsNative) {
-      int indexOf = jsPrototype.lastIndexOf(".");
-      namespace = indexOf == -1 ? "" : jsPrototype.substring(0, indexOf);
-      exportName = jsPrototype.substring(indexOf + 1);
-    }
-    boolean isJsType = jsType != null;
-    boolean isClassWideExport =
-        isJsNative || JdtUtil.getAnnotation(annotations, JSEXPORT_CLASS) != null;
-    boolean isJsFunction = JdtUtil.getAnnotation(annotations, JSFUNCTION_CLASS) != null;
-    boolean canBeImplementedExternally =
-        (type instanceof JInterfaceType && (isJsType || isJsFunction))
-        || (type instanceof JClassType && isJsNative);
-    type.setJsTypeInfo(isJsType, isJsNative, isJsFunction, namespace, exportName, isClassWideExport,
-        canBeImplementedExternally);
-  }
-
-  public static void maybeSetJsInteropPropertiesNew(JDeclaredType type, Annotation[] annotations) {
     AnnotationBinding jsType = getInteropAnnotation(annotations, "JsType");
     String namespace = JdtUtil.getAnnotationParameterString(jsType, "namespace");
     String name = JdtUtil.getAnnotationParameterString(jsType, "name");
@@ -82,17 +51,10 @@ public static void maybeSetJsInteropPropertiesNew(JDeclaredType type, Annotation
 
     boolean isJsType = jsType != null;
     boolean isJsFunction = getInteropAnnotation(annotations, "JsFunction") != null;
-    boolean canBeImplementedExternally = isJsNative || isJsFunction;
+    type.setJsTypeInfo(isJsType, isJsNative, isJsFunction, namespace, name, isJsType);
-    type.setJsTypeInfo(isJsType, isJsNative, isJsFunction, namespace, name, isJsType,
-        canBeImplementedExternally);
-  }
-
-  public static void maybeSetJsInteropProperties(JMethod method, Annotation... annotations) {
-    boolean isPropertyAccessor = JdtUtil.getAnnotation(annotations, JSPROPERTY_CLASS) != null;
-    setJsInteropProperties(method, annotations, isPropertyAccessor);
   }
 
-  public static void maybeSetJsInteropPropertiesNew(
+  public static void maybeSetJsInteropProperties(
       JMethod method, boolean generateExport, Annotation... annotations) {
     AnnotationBinding annotation = getInteropAnnotation(annotations, "JsMethod");
     if (annotation == null) {
@@ -103,52 +65,16 @@ public static void maybeSetJsInteropPropertiesNew(
     }
 
     boolean isPropertyAccessor = getInteropAnnotation(annotations, "JsProperty") != null;
-    setJsInteropPropertiesNew(method, annotations, annotation, isPropertyAccessor, generateExport);
+    setJsInteropProperties(method, annotations, annotation, isPropertyAccessor, generateExport);
   }
 
-  public static void maybeSetJsInteropProperties(JField field, Annotation... annotations) {
+  public static void maybeSetJsInteropProperties(
-    if (field.getEnclosingType().isJsNative() && field.isCompileTimeConstant()) {
-      field.setJsOverlay();
-    }
-    setJsInteropProperties(field, annotations, false);
-  }
-
-  public static void maybeSetJsInteropPropertiesNew(
       JField field, boolean generateExport, Annotation... annotations) {
     AnnotationBinding annotation = getInteropAnnotation(annotations, "JsProperty");
-    setJsInteropPropertiesNew(field, annotations, annotation, false, generateExport);
+    setJsInteropProperties(field, annotations, annotation, false, generateExport);
   }
 
-  private static void setJsInteropProperties(
+  private static void setJsInteropProperties(JMember member, Annotation[] annotations,
-      JMember member, Annotation[] annotations, boolean isPropertyAccessor) {
-    boolean hasExport = JdtUtil.getAnnotation(annotations, JSEXPORT_CLASS) != null;
-    JsMemberType memberType = getJsMemberType(member, isPropertyAccessor);
-    String namespace = maybeGetJsNamespace(annotations);
-    String exportName = maybeGetJsExportName(annotations);
-    if (hasExport) {
-      member.setJsMemberInfo(memberType, namespace, exportName, true);
-      return;
-    }
-
-    /* Apply class wide JsInterop annotations */
-
-    boolean ignore = JdtUtil.getAnnotation(annotations, JSNOEXPORT_CLASS) != null;
-    if (ignore || (!member.isPublic() && !member.getEnclosingType().isJsNative())) {
-      return;
-    }
-
-    JDeclaredType enclosingType = member.getEnclosingType();
-
-    if (enclosingType.isJsType() && member.needsDynamicDispatch()) {
-      member.setJsMemberInfo(memberType, namespace, exportName, true);
-    }
-
-    if (enclosingType.isClassWideExport() && !member.needsDynamicDispatch()) {
-      member.setJsMemberInfo(memberType, namespace, exportName, true);
-    }
-  }
-
-  private static void setJsInteropPropertiesNew(JMember member, Annotation[] annotations,
       AnnotationBinding memberAnnotation, boolean isAccessor, boolean generateExport) {
     if (getInteropAnnotation(annotations, "JsOverlay") != null) {
       member.setJsOverlay();
@@ -195,14 +121,4 @@ private static JsMemberType getJsPropertyAccessorType(JMethod method) {
   private static AnnotationBinding getInteropAnnotation(Annotation[] annotations, String name) {
     return JdtUtil.getAnnotation(annotations, "jsinterop.annotations." + name);
   }
-
-  private static String maybeGetJsNamespace(Annotation[] annotations) {
-    AnnotationBinding jsNamespace = JdtUtil.getAnnotation(annotations, JSNAMESPACE_CLASS);
-    return JdtUtil.getAnnotationParameterString(jsNamespace, "value");
-  }
-
-  private static String maybeGetJsExportName(Annotation[] annotations) {
-    AnnotationBinding annotation = JdtUtil.getAnnotation(annotations, JSEXPORT_CLASS);
-    return JdtUtil.getAnnotationParameterString(annotation, "value");
-  }
 }
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
@@ -27,7 +27,6 @@
 import com.google.gwt.dev.util.arg.OptionGenerateJsInteropExports;
 import com.google.gwt.dev.util.arg.OptionIncrementalCompile;
 import com.google.gwt.dev.util.arg.OptionInlineLiteralParameters;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode;
 import com.google.gwt.dev.util.arg.OptionJsonSoycEnabled;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.OptionNamespace;
@@ -55,7 +54,7 @@ public interface JJSOptions extends OptionOptimize,
     OptionRemoveDuplicateFunctions, OptionStrict,
     OptionSoycHtmlDisabled, OptionEnableClosureCompiler,
     OptionFragmentsMerge, OptionFragmentCount, OptionSourceLevel, OptionNamespace,
-    OptionCheckedMode, OptionJsInteropMode, OptionGenerateJsInteropExports, OptionUseDetailedTypeIds,
+    OptionCheckedMode, OptionGenerateJsInteropExports, OptionUseDetailedTypeIds,
     OptionAllowJDTConstantInlining, OptionMethodNameDisplayMode,
     OptionClosureFormattedOutput {
 }
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
@@ -16,7 +16,6 @@
 package com.google.gwt.dev.jjs;
 
 import com.google.gwt.dev.js.JsNamespaceOption;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.OptionOptimize;
 import com.google.gwt.dev.util.arg.SourceLevel;
@@ -51,7 +50,6 @@ public class JJSOptionsImpl implements JJSOptions, Serializable {
   private boolean soycExtra = false;
   private boolean soycHtmlDisabled = false;
   private boolean strict = false;
-  private OptionJsInteropMode.Mode jsInteropMode = OptionJsInteropMode.Mode.JS_RC;
   private boolean generateJsInteropExports = false;
   private boolean useDetailedTypeIds = false;
   private OptionMethodNameDisplayMode.Mode methodNameDisplayMode =
@@ -85,7 +83,6 @@ public void copyFrom(JJSOptions other) {
     setStrict(other.isStrict());
     setSourceLevel(other.getSourceLevel());
     setNamespace(other.getNamespace());
-    setJsInteropMode(other.getJsInteropMode());
     setGenerateJsInteropExports(other.shouldGenerateJsInteropExports());
     setUseDetailedTypeIds(other.useDetailedTypeIds());
     setMethodNameDisplayMode(other.getMethodNameDisplayMode());
@@ -346,16 +343,6 @@ public boolean shouldRemoveDuplicateFunctions() {
     return removeDuplicateFunctions;
   }
 
-  @Override
-  public OptionJsInteropMode.Mode getJsInteropMode() {
-    return jsInteropMode;
-  }
-
-  @Override
-  public void setJsInteropMode(OptionJsInteropMode.Mode mode) {
-    jsInteropMode = mode;
-  }
-
   @Override
   public boolean shouldGenerateJsInteropExports() {
     return generateJsInteropExports;

diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -171,7 +171,6 @@
 import com.google.gwt.dev.util.Name.SourceName;
 import com.google.gwt.dev.util.Pair;
 import com.google.gwt.dev.util.Util;
-import com.google.gwt.dev.util.arg.OptionJsInteropMode.Mode;
 import com.google.gwt.dev.util.arg.OptionOptimize;
 import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
@@ -1163,8 +1162,7 @@ private UnifiedAst precompile(PrecompilationContext precompilationContext)
        */
 
       // (1) Initialize local state
-      boolean legacyJsInterop = compilerContext.getOptions().getJsInteropMode() == Mode.JS;
+      jprogram = new JProgram(compilerContext.getMinimalRebuildCache());
-      jprogram = new JProgram(compilerContext.getMinimalRebuildCache(), legacyJsInterop);
       // Synchronize JTypeOracle with compile optimization behavior.
       jprogram.typeOracle.setOptimize(
           options.getOptimizationLevel() > OptionOptimize.OPTIMIZE_LEVEL_DRAFT);