[GR-20490] Allow dependent repositories to hook into the import update command.

PullRequest: graalpython/846

Author: timfel

.gitignore

@@ -55,6 +55,7 @@ Python3.g4.stamp
 /graalpython/com.oracle.graal.python.test/src/tests/cpyext/Test*.c
 /graalpython/com.oracle.graal.python.test/src/tests/cpyext/*.sha256
 /*.diff
+/testenv
 ## generated from: pyhocon -i ci.hocon -f json -o ci.json
 /ci.json
 /*.err

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/FrozenSetBuiltins.java

@@ -396,7 +396,6 @@ HashingStorage doIterable(VirtualFrame frame, HashingStorage dictStorage, Object
                         @Cached("create()") IsBuiltinClassProfile errorProfile,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @CachedLibrary("dictStorage") HashingStorageLibrary lib) {
-
             HashingStorage curStorage = dictStorage;
             Object iterator = getIteratorNode.executeWith(frame, iterable);
             while (true) {
@@ -454,19 +453,19 @@ abstract static class IsSupersetNode extends PythonBinaryBuiltinNode {
         @Specialization(limit = "1")
         boolean isSuperSet(VirtualFrame frame, PBaseSet self, PBaseSet other,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
-                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
+                        @CachedLibrary("other.getDictStorage()") HashingStorageLibrary lib) {
             if (hasFrame.profile(frame != null)) {
                 return lib.compareKeysWithState(other.getDictStorage(), self.getDictStorage(), PArguments.getThreadState(frame)) <= 0;
             } else {
                 return lib.compareKeys(other.getDictStorage(), self.getDictStorage()) <= 0;
             }
         }
 
-        @Specialization(replaces = "isSuperSet", limit = "1")
+        @Specialization(replaces = "isSuperSet")
         boolean isSuperSetGeneric(VirtualFrame frame, PBaseSet self, Object other,
                         @Cached SetNodes.ConstructSetNode constructSetNode,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
-                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "3") HashingStorageLibrary lib) {
             PSet otherSet = constructSetNode.executeWith(frame, other);
             if (hasFrame.profile(frame != null)) {
                 return lib.compareKeysWithState(otherSet.getDictStorage(), self.getDictStorage(), PArguments.getThreadState(frame)) <= 0;
@@ -480,10 +479,10 @@ boolean isSuperSetGeneric(VirtualFrame frame, PBaseSet self, Object other,
     @Builtin(name = __LE__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     abstract static class LessEqualNode extends PythonBinaryBuiltinNode {
-        @Specialization
+        @Specialization(limit = "1")
         boolean doLE(VirtualFrame frame, PBaseSet self, PBaseSet other,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
-                        @CachedLibrary(limit = "3") HashingStorageLibrary lib) {
+                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
             if (hasFrame.profile(frame != null)) {
                 return lib.compareKeysWithState(self.getDictStorage(), other.getDictStorage(), PArguments.getThreadState(frame)) <= 0;
             } else {
@@ -504,7 +503,7 @@ abstract static class GreaterEqualNode extends PythonBinaryBuiltinNode {
         @Specialization(limit = "1")
         boolean doGE(VirtualFrame frame, PBaseSet self, PBaseSet other,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
-                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
+                        @CachedLibrary("other.getDictStorage()") HashingStorageLibrary lib) {
             if (hasFrame.profile(frame != null)) {
                 return lib.compareKeysWithState(other.getDictStorage(), self.getDictStorage(), PArguments.getThreadState(frame)) <= 0;
             } else {

mx.graalpython/mx_graalpython.py

@@ -865,6 +865,12 @@ def update_import_cmd(args):
         overlaytip = str(vc.tip(overlaydir)).strip()
         repos_updated.append(overlaydir)
 
+    # now allow dependent repos to hook into update
+    for repo in repos:
+        cmdname = "%s-update-import" % os.path.basename(repo)
+        if mx.run_mx(["help", cmdname], nonZeroIsFatal=False, quiet=True) == 0:
+            mx.run_mx([cmdname, "--overlaydir=%s" % overlaydir], suite=repo, nonZeroIsFatal=True)
+
     # update ci import in all our repos, commit the full update, and push verbosely
     prev_verbosity = mx._opts.very_verbose
     for repo in repos: