Rename Method.isNative and MethodBody.isNative to .isJsniMethod and .…

…isJsniMethodBody. The purpose of this rename is to avoid confusion with isJsNative. Change-Id: I62e7ad3af1487d27414aeef354a9cac00a247938
gwtproject · Oct 12, 2015 · 3744185 · 3744185
1 parent be1f83b
commit 3744185
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 50 deletions.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/CanBeNative.java b/dev/core/src/com/google/gwt/dev/jjs/ast/CanBeNative.java
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JAbstractMethodBody.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JAbstractMethodBody.java
@@ -31,7 +31,7 @@ public JMethod getMethod() {
     return method;
   }
 
-  public abstract boolean isNative();
+  public abstract boolean isJsniMethodBody();
 
   public void setMethod(JMethod method) {
     this.method = method;

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JMethod.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JMethod.java
@@ -38,7 +38,7 @@
 /**
  * A Java method implementation.
  */
-public class JMethod extends JNode implements JMember, CanBeAbstract, CanBeNative {
+public class JMethod extends JNode implements JMember, CanBeAbstract {
 
   /**
    * Indicates whether a method is a JsProperty accessor.
@@ -610,12 +610,11 @@ public boolean isForwarding() {
     return isForwarding;
   }
 
-  @Override
+  public boolean isJsniMethod() {
-  public boolean isNative() {
     if (body == null) {
       return false;
     } else {
-      return body.isNative();
+      return body.isJsniMethodBody();
     }
   }
 
@@ -651,7 +650,7 @@ public boolean needsDynamicDispatch() {
    */
   public void removeParam(int index) {
     params = Lists.remove(params, index);
-    if (isNative()) {
+    if (isJsniMethod()) {
       ((JsniMethodBody) getBody()).getFunc().getParameters().remove(index);
     }
   }

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JMethodBody.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JMethodBody.java
@@ -58,7 +58,7 @@ public List<JStatement> getStatements() {
   }
 
   @Override
-  public boolean isNative() {
+  public boolean isJsniMethodBody() {
     return false;
   }
 

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/js/JsniMethodBody.java b/dev/core/src/com/google/gwt/dev/jjs/ast/js/JsniMethodBody.java
@@ -110,7 +110,7 @@ public Set<String> getUsedStrings() {
   }
 
   @Override
-  public boolean isNative() {
+  public boolean isJsniMethodBody() {
     return true;
   }
 

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
@@ -346,7 +346,7 @@ public boolean visit(final JMethod x, Context ctx) {
         rescue(enclosingType, false);
       }
 
-      if (x.isNative()) {
+      if (x.isJsniMethod()) {
         // Manually rescue native parameter references
         final JsniMethodBody body = (JsniMethodBody) x.getBody();
         final JsFunction func = body.getFunc();
@@ -614,7 +614,7 @@ private void rescue(JMethod method) {
         if (dependencyRecorder != null) {
           curMethodStack.remove(curMethodStack.size() - 1);
         }
-        if (method.isNative()) {
+        if (method.isJsniMethod()) {
           // Returning from this method passes a value from JavaScript into Java.
           maybeRescueJavaScriptObjectPassingIntoJava(method.getType());
         }

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
@@ -377,7 +377,7 @@ public void endVisit(JMethodCall x, Context ctx) {
         maybeBlackListDueToStaticCall(x.getSourceInfo(), target);
       }
 
-      if (x.getTarget().isNative()) {
+      if (x.getTarget().isJsniMethod()) {
         // Black list enum types declared in parameters of native functions.
         for (JParameter parameter :x.getTarget().getParams()) {
           blackListIfEnum(parameter.getType(), x.getSourceInfo());

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
@@ -395,14 +395,14 @@ public boolean visit(JMethod x, Context ctx) {
        * Only allocate a name for a function if it is native, not polymorphic,
        * is a JNameOf target or stack-stripping is disabled.
        */
-      if (!stripStack || !polymorphicNames.containsKey(x) || x.isNative()
+      if (!stripStack || !polymorphicNames.containsKey(x) || x.isJsniMethod()
           || nameOfTargets.contains(x)) {
         globalName = topScope.declareName(mangleName, name);
         names.put(x, globalName);
         recordSymbol(x, globalName);
       }
       JsFunction function;
-      if (x.isNative()) {
+      if (x.isJsniMethod()) {
         // set the global name of the JSNI peer
         JsniMethodBody body = (JsniMethodBody) x.getBody();
         function = body.getFunc();
@@ -796,7 +796,7 @@ public JsNode transformMethod(JMethod method) {
       JsFunction function = transform(method.getBody());
       function.setInliningMode(method.getInliningMode());
 
-      if (!method.isNative()) {
+      if (!method.isJsniMethod()) {
         // Setup params on the generated function. A native method already got
         // its jsParams set when parsed from JSNI.
         transformInto(method.getParams(), function.getParameters());
@@ -2615,7 +2615,7 @@ private class CollectJsFunctionsForInlining extends JVisitor {
 
     @Override
     public void endVisit(JMethod x, Context ctx) {
-      if (x.isNative()) {
+      if (x.isJsniMethod()) {
         // These are methods whose bodies where not traversed by the Java method inliner.
         JsFunction function = jsFunctionsByJavaMethodBody.get(x.getBody());
         if (function != null && function.getBody() != null) {
@@ -2637,7 +2637,7 @@ public void endVisit(JsFunction x, JsContext ctx) {
     @Override
     public void endVisit(JMethodCall x, Context ctx) {
       JMethod target = x.getTarget();
-      if (target.isInliningAllowed() && (target.isNative()
+      if (target.isInliningAllowed() && (target.isJsniMethod()
           || program.getIndexedTypes().contains(target.getEnclosingType())
           || target.getInliningMode() == InliningMode.FORCE_INLINE)) {
         // These are either: 1) callsites to JSNI functions, in which case MethodInliner did not

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
@@ -2452,7 +2452,7 @@ public boolean visit(MethodDeclaration x, ClassScope scope) {
         JMethod method = typeMap.get(x.binding);
         assert !method.isExternal();
         JMethodBody body = null;
-        if (!method.isNative()) {
+        if (!method.isJsniMethod()) {
           body = new JMethodBody(method.getSourceInfo());
           method.setBody(body);
         }

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplicitUpcastAnalyzer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplicitUpcastAnalyzer.java
@@ -108,7 +108,7 @@ public void endVisit(JMethod x, Context ctx) {
       processIfTypesNotEqual(x.getType(), overridden.getType(), x.getSourceInfo());
     }
 
-    if (x.getBody() != null && x.getBody().isNative()) {
+    if (x.getBody() != null && x.getBody().isJsniMethodBody()) {
       /*
        * Check if this method has a native (jsni) method body, in which case all
        * arguments passed in are implicitly cast to JavaScriptObject

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JModVisitorWithTemporaryVariableCreation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JModVisitorWithTemporaryVariableCreation.java
@@ -62,7 +62,7 @@ public final boolean visit(JStatement x, Context ctx) {
   }
 
   protected JLocal createTempLocal(SourceInfo info, JType type) {
-    assert !getCurrentMethod().isNative();
+    assert !getCurrentMethod().isJsniMethod();
     JMethodBody currentMethodBody = (JMethodBody) getCurrentMethod().getBody();
     String temporaryLocalName = newTemporaryLocalName(info, type, currentMethodBody);
     JLocal local = JProgram.createLocal(info, temporaryLocalName, type, false, currentMethodBody);

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
@@ -210,7 +210,7 @@ public boolean visit(JMethod x, Context ctx) {
        * Rewrite the method body. Update all thisRefs to paramRefs. Update
        * paramRefs and localRefs to target the params/locals in the new method.
        */
-      if (newMethod.isNative()) {
+      if (newMethod.isJsniMethod()) {
         // For natives, we also need to create the JsParameter for this$static,
         // because the jsFunc already has parameters.
         // TODO: Do we really need to do that in BuildTypeMap?

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodInliner.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodInliner.java
@@ -124,7 +124,7 @@ public void endVisit(JMultiExpression x, Context ctx) {
     private InlineResult tryInlineMethodCall(JMethodCall x, Context ctx) {
       JMethod method = x.getTarget();
 
-      if (!method.isStatic() || method.isNative() || method.canBeImplementedExternally()) {
+      if (!method.isStatic() || method.isJsniMethod() || method.canBeImplementedExternally()) {
         // Only inline static methods that are not native.
         return InlineResult.BLACKLIST;
       }
@@ -210,7 +210,7 @@ private JMethodCall createClinitCall(JMethodCall x) {
       JMethod clinit = targetType.getClinitMethod();
 
       // If the clinit is a non-native, empty body we can optimize it out here
-      if (!clinit.isNative() && (((JMethodBody) clinit.getBody())).getStatements().size() == 0) {
+      if (!clinit.isJsniMethod() && (((JMethodBody) clinit.getBody())).getStatements().size() == 0) {
         return null;
       }
 

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
@@ -17,7 +17,6 @@
 
 import com.google.gwt.dev.jjs.ast.CanBeAbstract;
 import com.google.gwt.dev.jjs.ast.CanBeFinal;
-import com.google.gwt.dev.jjs.ast.CanBeNative;
 import com.google.gwt.dev.jjs.ast.CanBeStatic;
 import com.google.gwt.dev.jjs.ast.Context;
 import com.google.gwt.dev.jjs.ast.HasName;
@@ -1082,8 +1081,8 @@ protected void printName(HasName x) {
     print(x.getName());
   }
 
-  protected void printNativeFlag(CanBeNative x) {
+  protected void printNativeFlag(JMethod x) {
-    if (x.isNative()) {
+    if (x.isJsniMethod()) {
       print(CHARS_NATIVE);
     }
   }

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/TypeTightener.java b/dev/core/src/com/google/gwt/dev/jjs/impl/TypeTightener.java
@@ -523,7 +523,7 @@ public void exit(JMethod x, Context ctx) {
        * The only information that we can infer about native methods is if they
        * are declared to return a leaf type.
        */
-      if (x.isNative() || x.canBeImplementedExternally()) {
+      if (x.isJsniMethod() || x.canBeImplementedExternally()) {
         return;
       }
 
@@ -616,7 +616,7 @@ public boolean enter(JMethod x, Context ctx) {
        * Explicitly NOT visiting native methods since we can't infer further
        * type information.
        */
-      return !x.isNative();
+      return !x.isJsniMethod();
     }
 
     /**