Merge branch 'gwtproject:main' into math

zbynek · web-flow · commit c9c62b1ec19b · 2025-11-06T22:20:02.000+01:00
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxDir.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxDir.java
@@ -20,6 +20,7 @@
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import java.io.File;
 import java.io.IOException;
@@ -87,7 +88,7 @@ static OutboxDir create(File dir, TreeLogger logger) throws IOException {
     // (This is not guaranteed to delete all directories on Windows if a directory is locked.)
     for (File candidate : children) {
       if (candidate.getName().startsWith(COMPILE_DIR_PREFIX)) {
-        MoreFiles.deleteRecursively(candidate.toPath());
+        MoreFiles.deleteRecursively(candidate.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
         if (candidate.exists()) {
           logger.log(Type.WARN, "unable to delete '" + candidate + "' (skipped)");
         }
diff --git a/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java b/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
@@ -20,6 +20,7 @@
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.dev.cfg.Properties;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,7 +62,8 @@ public File createCompilerWorkDir(TreeLogger logger, String moduleName)
     File compilerWorkDir = getCompilerWorkDir(moduleName);
     if (compilerWorkDir.exists()) {
       try {
-        MoreFiles.deleteDirectoryContents(compilerWorkDir.toPath());
+        MoreFiles.deleteDirectoryContents(compilerWorkDir.toPath(),
+            RecursiveDeleteOption.ALLOW_INSECURE);
       } catch (IOException e) {
         logger.log(TreeLogger.ERROR, "Unable to delete contents of " + compilerWorkDir, e);
         throw new UnableToCompleteException();
diff --git a/dev/core/src/com/google/gwt/dev/Compiler.java b/dev/core/src/com/google/gwt/dev/Compiler.java
@@ -40,6 +40,7 @@
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
 import com.google.gwt.thirdparty.guava.common.collect.Sets;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import java.io.File;
 import java.io.IOException;
@@ -247,7 +248,8 @@ public static boolean compile(
     } finally {
       if (tempWorkDir) {
         try {
-          MoreFiles.deleteRecursively(options.getWorkDir().toPath());
+          MoreFiles.deleteRecursively(options.getWorkDir().toPath(),
+              RecursiveDeleteOption.ALLOW_INSECURE);
         } catch (IOException e) {
           logger.log(TreeLogger.WARN, "Unable to delete temporary work directory: "
               + options.getWorkDir(), e);
diff --git a/dev/core/src/com/google/gwt/dev/DevMode.java b/dev/core/src/com/google/gwt/dev/DevMode.java
@@ -50,6 +50,7 @@
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 import com.google.gwt.util.tools.ArgHandlerFlag;
 import com.google.gwt.util.tools.ArgHandlerString;
 
@@ -494,7 +495,8 @@ protected void doShutDownServer() {
 
     if (tempWorkDir) {
       try {
-        MoreFiles.deleteRecursively(options.getWorkDir().toPath());
+        MoreFiles.deleteRecursively(options.getWorkDir().toPath(),
+            RecursiveDeleteOption.ALLOW_INSECURE);
       } catch (IOException e) {
         getTopLogger().log(TreeLogger.ERROR,
             "Unable to delete temporary work directory " + options.getWorkDir().getAbsolutePath(),
diff --git a/dev/core/src/com/google/gwt/dev/Link.java b/dev/core/src/com/google/gwt/dev/Link.java
@@ -56,6 +56,7 @@
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
 import com.google.gwt.thirdparty.guava.common.collect.Sets;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -345,7 +346,7 @@ static OutputFileSet chooseOutputFileSet(File dirOrJar,
     } else {
       File target = new File(dirOrJar, pathPrefix);
       if (target.exists()) {
-        MoreFiles.deleteDirectoryContents(target.toPath());
+        MoreFiles.deleteDirectoryContents(target.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
       }
       return new OutputFileSetOnDirectory(dirOrJar, pathPrefix);
     }
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
@@ -134,6 +134,22 @@ public void endVisit(JMethodCall x, Context ctx) {
         return;
       }
 
+      JMethod.Specialization specialization = getCurrentMethod().getSpecialization();
+      // If we have a specialization, don't inline that away - specializations must be called
+      // so they aren't pruned or type tightened into uselessness.
+      if (specialization != null) {
+        if (specialization.getTargetMethod() == method) {
+          return;
+        }
+        // We might have had a static impl that in turn will have a specialization - ensure we
+        // also don't inline that specialization away. Note that this check looks for it "backwards"
+        // by checking if the inlinable method has an instance method, since current method might
+        // have once had a static method, but it was already removed.
+        if (specialization.getTargetMethod() == program.instanceMethodForStaticImpl(method)) {
+          return;
+        }
+      }
+
       if (tryInlineMethodCall(x, ctx) == InlineResult.BLACKLIST) {
         // Do not try to inline this method again
         cannotInline.add(method);
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
@@ -32,6 +32,7 @@
 import com.google.gwt.thirdparty.guava.common.collect.Maps;
 import com.google.gwt.thirdparty.guava.common.collect.Sets;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 import com.google.gwt.thirdparty.guava.common.primitives.Ints;
 import com.google.gwt.thirdparty.json.JSONArray;
 import com.google.gwt.thirdparty.json.JSONException;
@@ -528,7 +529,7 @@ public void testSourceMap() throws Exception {
       testSoycCorrespondence(new File(parentDir + "/soycReport/"));
 
     } finally {
-      MoreFiles.deleteRecursively(work.toPath());
+      MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 }
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/SymbolMapTest.java b/dev/core/test/com/google/gwt/core/ext/linker/SymbolMapTest.java
@@ -26,6 +26,7 @@
 import com.google.gwt.thirdparty.guava.common.collect.Maps;
 import com.google.gwt.thirdparty.guava.common.collect.Multimap;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import junit.framework.TestCase;
 
@@ -242,7 +243,7 @@ private void assertSymbolMapSanity(int optimizeLevel) throws Exception {
         assertSymbolUniquenessForMethods(symbolDataByJsniIdentifier);
       }
     } finally {
-      MoreFiles.deleteRecursively(work.toPath());
+      MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 
diff --git a/dev/core/test/com/google/gwt/dev/CompilerTest.java b/dev/core/test/com/google/gwt/dev/CompilerTest.java
@@ -37,6 +37,7 @@
 import com.google.gwt.thirdparty.guava.common.collect.Lists;
 import com.google.gwt.thirdparty.guava.common.collect.Sets;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import java.io.File;
 import java.io.IOException;
@@ -2505,7 +2506,7 @@ private void assertCompileSucceeds(CompilerOptions options, String moduleName,
       // is clean to avoid confusion when returning the output JS.
       File outputDir = new File(applicationDir.getPath() + File.separator + moduleName);
       if (outputDir.exists()) {
-        MoreFiles.deleteDirectoryContents(outputDir.toPath());
+        MoreFiles.deleteDirectoryContents(outputDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
       }
 
       // Fake out the resource loader to read resources both from the normal classpath as well as
@@ -2537,7 +2538,7 @@ private void assertCompileSucceeds(CompilerOptions options, String moduleName,
       // Run the compiler once here.
       Compiler.compile(logger, options);
     } finally {
-      MoreFiles.deleteRecursively(compileWorkDir.toPath());
+      MoreFiles.deleteRecursively(compileWorkDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
       if (oldPersistentUnitCacheValue == null) {
         System.clearProperty(UnitCacheSingleton.GWT_PERSISTENTUNITCACHE);
       } else {
@@ -2584,8 +2585,8 @@ private void assertDeterministicBuild(String topLevelModule, int optimizationLev
       } else {
         System.setProperty(UnitCacheSingleton.GWT_PERSISTENTUNITCACHE, oldPersistentUnitCacheValue);
       }
-      MoreFiles.deleteRecursively(firstCompileWorkDir.toPath());
-      MoreFiles.deleteRecursively(secondCompileWorkDir.toPath());
+      MoreFiles.deleteRecursively(firstCompileWorkDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
+      MoreFiles.deleteRecursively(secondCompileWorkDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 
@@ -2689,7 +2690,7 @@ private String compileToJs(TreeLogger logger, CompilerOptions compilerOptions, F
     // clean to avoid confusion when returning the output JS.
     File outputDir = new File(applicationDir.getPath() + File.separator + moduleName);
     if (outputDir.exists()) {
-      MoreFiles.deleteDirectoryContents(outputDir.toPath());
+      MoreFiles.deleteDirectoryContents(outputDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
 
     // Fake out the resource loader to read resources both from the normal classpath as well as this
diff --git a/dev/core/test/com/google/gwt/dev/SoycTest.java b/dev/core/test/com/google/gwt/dev/SoycTest.java
@@ -19,6 +19,7 @@
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import junit.framework.TestCase;
 
@@ -52,7 +53,7 @@ public void testSoyc() throws UnableToCompleteException, IOException {
 
       assertFalse(new File(options.getExtraDir() + "/hello/soycReport/compile-report/index2.html").exists());
     } finally {
-      MoreFiles.deleteRecursively(work.toPath());
+      MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 }
diff --git a/dev/core/test/com/google/gwt/dev/javac/PersistentUnitCacheTest.java b/dev/core/test/com/google/gwt/dev/javac/PersistentUnitCacheTest.java
@@ -19,6 +19,7 @@
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 import com.google.gwt.thirdparty.guava.common.util.concurrent.Futures;
 
 import junit.framework.TestCase;
@@ -69,7 +70,7 @@ protected void setUp() throws Exception {
   public void tearDown() {
     if (lastParentDir != null) {
       try {
-        MoreFiles.deleteRecursively(lastParentDir.toPath());
+        MoreFiles.deleteRecursively(lastParentDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
       } catch (IOException e) {
         throw new UncheckedIOException(e);
       }
diff --git a/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java b/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java
@@ -31,6 +31,7 @@
 import com.google.gwt.dev.javac.StandardGeneratorContext;
 import com.google.gwt.dev.resource.Resource;
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import junit.framework.TestCase;
 
@@ -291,7 +292,7 @@ public void testTryCreateResource_writeAfterCommit()
   protected void tearDown() throws Exception {
     for (int i = toDelete.size() - 1; i >= 0; --i) {
       File f = toDelete.get(i);
-      MoreFiles.deleteRecursively(f.toPath());
+      MoreFiles.deleteRecursively(f.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
       assertFalse("Unable to delete " + f.getAbsolutePath(), f.exists());
     }
   }
diff --git a/dev/core/test/com/google/gwt/dev/util/OutputFileSetOnDirectoryTest.java b/dev/core/test/com/google/gwt/dev/util/OutputFileSetOnDirectoryTest.java
@@ -14,6 +14,7 @@
 package com.google.gwt.dev.util;
 
 import com.google.gwt.thirdparty.guava.common.io.MoreFiles;
+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;
 
 import junit.framework.TestCase;
 
@@ -45,7 +46,7 @@ public void testCreateNewOutputStream() throws IOException {
       assertTrue(new File(work, "to/file").exists());
 
     } finally {
-      MoreFiles.deleteRecursively(work.toPath());
+      MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 
@@ -62,7 +63,7 @@ public void testNewFileEqualTimestampOverwrites() throws IOException {
       assertTrue(secondStream instanceof FileOutputStream);
       secondStream.close();
     } finally {
-      MoreFiles.deleteRecursively(work.toPath());
+      MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 
@@ -79,7 +80,7 @@ public void testNewFileOlderTimestampDies() throws IOException {
       assertFalse(secondStream instanceof FileOutputStream);
       secondStream.close();
     } finally {
-      MoreFiles.deleteRecursively(work.toPath());
+      MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
   }
 }
diff --git a/user/super/com/google/gwt/emul/java/lang/String.java b/user/super/com/google/gwt/emul/java/lang/String.java
@@ -399,7 +399,7 @@ public String concat(String str) {
   }
 
   public boolean contains(CharSequence s) {
-    return indexOf(s.toString()) != -1;
+    return asNativeString().includes(s.toString());
   }
 
   public boolean contentEquals(CharSequence cs) {
@@ -411,9 +411,7 @@ public boolean contentEquals(StringBuffer sb) {
   }
 
   public boolean endsWith(String suffix) {
-    // If IE8 supported negative start index, we could have just used "-suffixlength".
-    int suffixlength = suffix.length();
-    return asNativeString().substr(length() - suffixlength, suffixlength).equals(suffix);
+    return asNativeString().endsWith(suffix);
   }
 
   // Marked with @DoNotInline because we don't have static eval for "==" yet.
@@ -691,11 +689,11 @@ public String[] split(String regex, int maxMatch) {
   }
 
   public boolean startsWith(String prefix) {
-    return startsWith(prefix, 0);
+    return asNativeString().startsWith(prefix);
   }
 
   public boolean startsWith(String prefix, int toffset) {
-    return toffset >= 0 && asNativeString().substr(toffset, prefix.length()).equals(prefix);
+    return asNativeString().startsWith(prefix, toffset);
   }
 
   @Override
@@ -991,11 +989,16 @@ private static class NativeString {
     public static native String fromCharCode(char x);
     public int length;
     public native char charCodeAt(int index);
+    public native boolean endsWith(String suffix);
     public native int indexOf(String str);
     public native int indexOf(String str, int startIndex);
+    public native boolean includes(String str);
+    public native boolean includes(String str, int startIndex);
     public native int lastIndexOf(String str);
     public native int lastIndexOf(String str, int start);
     public native String replace(NativeRegExp regex, String replace);
+    public native boolean startsWith(String prefix);
+    public native boolean startsWith(String prefix, int toffset);
     public native String substr(int beginIndex);
     public native String substr(int beginIndex, int len);
     public native String toLocaleLowerCase();
diff --git a/user/super/com/google/gwt/emul/java/util/EnumSet.java b/user/super/com/google/gwt/emul/java/util/EnumSet.java
@@ -21,6 +21,7 @@
 import static javaemul.internal.InternalPreconditions.checkState;
 
 import javaemul.internal.ArrayHelper;
+import javaemul.internal.JsUtils;
 import javaemul.internal.annotations.SpecializeMethod;
 
 /**
@@ -136,7 +137,7 @@ public EnumSet<E> clone() {
     @SpecializeMethod(params = Enum.class, target = "containsEnum")
     @Override
     public boolean contains(Object o) {
-      return (o instanceof Enum) && containsEnum((Enum) o);
+      return (o instanceof Enum) && containsEnum(JsUtils.uncheckedCast(o));
     }
 
     private boolean containsEnum(Enum e) {
@@ -151,7 +152,7 @@ public Iterator<E> iterator() {
     @SpecializeMethod(params = Enum.class, target = "removeEnum")
     @Override
     public boolean remove(Object o) {
-      return (o instanceof Enum) && removeEnum((Enum) o);
+      return (o instanceof Enum) && removeEnum(JsUtils.uncheckedCast(o));
     }
 
     private boolean removeEnum(Enum e) {
diff --git a/user/super/com/google/gwt/emul/javaemul/internal/JsUtils.java b/user/super/com/google/gwt/emul/javaemul/internal/JsUtils.java
@@ -82,9 +82,9 @@ public static native boolean unsafeCastToBoolean(Object bool) /*-{
   }-*/;
 
   @UncheckedCast
-  public static native <T> T uncheckedCast(@DoNotAutobox Object o) /*-{
-    return o;
-  }-*/;
+  public static <T> T uncheckedCast(@DoNotAutobox Object o) {
+    return (T) o;
+  }
 
   @UncheckedCast
   public static native <T> T getProperty(Object map, String key) /*-{
diff --git a/user/super/com/google/gwt/emul/javaemul/internal/annotations/SpecializeMethod.java b/user/super/com/google/gwt/emul/javaemul/internal/annotations/SpecializeMethod.java
@@ -22,6 +22,10 @@
  * An annotation to mark a given method as being specialized. If the specified
  * parameters and return context match of a JMethodCall, then the call
  * is retargeted at the specialized version.
+ * <p/>
+ * The annotated method must call the target method directly, and the compiler
+ * must not inline the target method to prevent it from being pruned while it
+ * still might be used.
  */
 @Target(ElementType.METHOD)
 @CompilerHint

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`import com.google.gwt.thirdparty.guava.common.collect.Maps;`
`33`	`33`	`import com.google.gwt.thirdparty.guava.common.collect.Sets;`
`34`	`34`	`import com.google.gwt.thirdparty.guava.common.io.MoreFiles;`
	`35`	`+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;`
`35`	`36`	`import com.google.gwt.thirdparty.guava.common.primitives.Ints;`
`36`	`37`	`import com.google.gwt.thirdparty.json.JSONArray;`
`37`	`38`	`import com.google.gwt.thirdparty.json.JSONException;`
`@@ -528,7 +529,7 @@ public void testSourceMap() throws Exception {`
`528`	`529`	`testSoycCorrespondence(new File(parentDir + "/soycReport/"));`
`529`	`530`
`530`	`531`	`} finally {`
`531`		`- MoreFiles.deleteRecursively(work.toPath());`
	`532`	`+ MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);`
`532`	`533`	`}`
`533`	`534`	`}`
`534`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import com.google.gwt.thirdparty.guava.common.collect.Maps;`
`27`	`27`	`import com.google.gwt.thirdparty.guava.common.collect.Multimap;`
`28`	`28`	`import com.google.gwt.thirdparty.guava.common.io.MoreFiles;`
	`29`	`+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;`
`29`	`30`
`30`	`31`	`import junit.framework.TestCase;`
`31`	`32`
`@@ -242,7 +243,7 @@ private void assertSymbolMapSanity(int optimizeLevel) throws Exception {`
`242`	`243`	`assertSymbolUniquenessForMethods(symbolDataByJsniIdentifier);`
`243`	`244`	`}`
`244`	`245`	`} finally {`
`245`		`- MoreFiles.deleteRecursively(work.toPath());`
	`246`	`+ MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);`
`246`	`247`	`}`
`247`	`248`	`}`
`248`	`249`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import com.google.gwt.core.ext.UnableToCompleteException;`
`20`	`20`	`import com.google.gwt.dev.util.log.PrintWriterTreeLogger;`
`21`	`21`	`import com.google.gwt.thirdparty.guava.common.io.MoreFiles;`
	`22`	`+import com.google.gwt.thirdparty.guava.common.io.RecursiveDeleteOption;`
`22`	`23`
`23`	`24`	`import junit.framework.TestCase;`
`24`	`25`
`@@ -52,7 +53,7 @@ public void testSoyc() throws UnableToCompleteException, IOException {`
`52`	`53`
`53`	`54`	`assertFalse(new File(options.getExtraDir() + "/hello/soycReport/compile-report/index2.html").exists());`
`54`	`55`	`} finally {`
`55`		`- MoreFiles.deleteRecursively(work.toPath());`
	`56`	`+ MoreFiles.deleteRecursively(work.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`	`}`