Automatic merge of master into galahad

Author: OracleLabsAutomation

compiler/mx.compiler/suite.py

@@ -25,10 +25,6 @@
         "name" : "truffle",
         "subdir": True,
       },
-      {
-        "name" : "regex",
-        "subdir": True
-      },
       {
         "name" : "sdk",
         "subdir": True
@@ -464,7 +460,6 @@
         "truffle:TRUFFLE_TEST",
         "truffle:TRUFFLE_COMPILER",
         "truffle:TRUFFLE_RUNTIME",
-        "regex:TREGEX",
       ],
       "exclude" : [
         "mx:JUNIT",

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java

@@ -40,16 +40,17 @@
  */
 package com.oracle.truffle.regex.tregex.parser;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.regex.RegexFlags;
 import com.oracle.truffle.regex.RegexOptions;
 import com.oracle.truffle.regex.RegexSource;
 import com.oracle.truffle.regex.RegexSyntaxException;
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 public class JsFlagsTest {
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java

@@ -84,10 +84,11 @@ public void testBenchmarkRegexes() {
     }
 
     void testInputStringGenerator(String pattern) {
-        testInputStringGenerator(pattern, "", getEngineOptions(), getTRegexEncoding(), rng.nextLong(), compileRegex(pattern, ""));
+        testInputStringGenerator(pattern, "", getEngineOptions(), getTRegexEncoding(), rng.nextLong());
     }
 
-    private void testInputStringGenerator(String pattern, String flags, Map<String, String> options, Encodings.Encoding encoding, long rngSeed, Value compiledRegex) {
+    private void testInputStringGenerator(String pattern, String flags, Map<String, String> options, Encodings.Encoding encoding, long rngSeed) {
+        Value compiledRegex = compileRegex(pattern, flags);
         Value generator = getGenerator(pattern, flags, options, encoding);
         for (int i = 0; i < 20; i++) {
             Value input = generator.execute(rngSeed + i);
@@ -102,7 +103,7 @@ private void testInputStringGenerator(String pattern, String flags, Map<String,
     }
 
     private Value getGenerator(String pattern, String flags, Map<String, String> options, Encodings.Encoding encoding) {
-        Source.Builder builder = sourceBuilder(pattern, flags, options, encoding).option("regexDummyLang.GenerateInput", "true");
+        Source.Builder builder = sourceBuilder(pattern, flags, options(options), encoding).option("regexDummyLang.GenerateInput", "true");
         try {
             return context.parse(builder.build());
         } catch (IOException e) {