Changeset 244625 in webkit

Timestamp:

Apr 24, 2019, 4:23:00 PM (7 years ago)

Author:

Kocsen Chung

Message:

Revert r244122. rdar://problem/50132675

Location:

branches/safari-607.2.6.0-branch

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/map-b3-licm-infinite-loop.js (deleted)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/b3/testb3.cpp (modified) (2 diffs)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/WTF.xcodeproj/project.pbxproj (modified) (2 diffs)
• Source/WTF/wtf/BackwardsGraph.h (modified) (3 diffs)
• Source/WTF/wtf/SpanningTree.h (deleted)

branches/safari-607.2.6.0-branch/JSTests/ChangeLog

@@ +1 @@
+2019-04-24  Alan Coon  <alancoon@apple.com>
+
+        Revert r244122. rdar://problem/50132675
+
 2019-04-09  Alan Coon  <alancoon@apple.com>
 

branches/safari-607.2.6.0-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-24  Alan Coon  <alancoon@apple.com>
+
+        Revert r244122. rdar://problem/50132675
+
 2019-04-24  Alan Coon  <alancoon@apple.com>
 

branches/safari-607.2.6.0-branch/Source/JavaScriptCore/b3/testb3.cpp

@@ -16326 +16326 @@
 
     compileAndRun<void>(proc);
-}
-
-void testInfiniteLoopDoesntCauseBadHoisting()
-{
-    Procedure proc;
-    if (proc.optLevel() < 2)
-        return;
-    BasicBlock* root = proc.addBlock();
-    BasicBlock* header = proc.addBlock();
-    BasicBlock* loadBlock = proc.addBlock();
-    BasicBlock* postLoadBlock = proc.addBlock();
-
-    Value* arg = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
-    root->appendNewControlValue(proc, Jump, Origin(), header);
-
-    header->appendNewControlValue(
-        proc, Branch, Origin(),
-        header->appendNew<Value>(proc, Equal, Origin(),
-            arg,
-            header->appendNew<Const64Value>(proc, Origin(), 10)), header, loadBlock);
-
-    PatchpointValue* patchpoint = loadBlock->appendNew<PatchpointValue>(proc, Void, Origin());
-    patchpoint->effects = Effects::none();
-    patchpoint->effects.writesLocalState = true; // Don't DCE this.
-    patchpoint->setGenerator(
-        [&] (CCallHelpers& jit, const StackmapGenerationParams&) {
-            // This works because we don't have callee saves.
-            jit.emitFunctionEpilogue();
-            jit.ret();
-        });
-
-    Value* badLoad = loadBlock->appendNew<MemoryValue>(proc, Load, Int64, Origin(), arg, 0);
-
-    loadBlock->appendNewControlValue(
-        proc, Branch, Origin(),
-        loadBlock->appendNew<Value>(proc, Equal, Origin(),
-            badLoad,
-            loadBlock->appendNew<Const64Value>(proc, Origin(), 45)), header, postLoadBlock);
-
-    postLoadBlock->appendNewControlValue(proc, Return, Origin(), badLoad);
-
-    // The patchpoint early ret() works because we don't have callee saves.
-    auto code = compileProc(proc);
-    RELEASE_ASSERT(!proc.calleeSaveRegisterAtOffsetList().size()); 
-    invoke<void>(*code, static_cast<uint64_t>(55)); // Shouldn't crash dereferncing 55.
 }
 
@@ -17944 +17899 @@
     RUN(testLoopWithMultipleHeaderEdges());
 
-    RUN(testInfiniteLoopDoesntCauseBadHoisting());
-
     if (isX86()) {
         RUN(testBranchBitAndImmFusion(Identity, Int64, 1, Air::BranchTest32, Air::Arg::Tmp));

branches/safari-607.2.6.0-branch/Source/WTF/ChangeLog

@@ +1 @@
+2019-04-24  Alan Coon  <alancoon@apple.com>
+
+        Revert r244122. rdar://problem/50132675
+
 2019-04-09  Alan Coon  <alancoon@apple.com>
 

branches/safari-607.2.6.0-branch/Source/WTF/WTF.xcodeproj/project.pbxproj

@@ -389 +389 @@
                 70ECA60B1B02426800449739 /* SymbolImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolImpl.h; sourceTree = "<group>"; };
                 70ECA60C1B02426800449739 /* UniquedStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniquedStringImpl.h; sourceTree = "<group>"; };
-                79038E05224B05A7004C0738 /* SpanningTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpanningTree.h; sourceTree = "<group>"; };
                 7936D6A91C99F8AE000D1AED /* SmallPtrSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallPtrSet.h; sourceTree = "<group>"; };
                 793BFADD9CED44B8B9FBCA16 /* StdUnorderedMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StdUnorderedMap.h; sourceTree = "<group>"; };
@@ -1079 +1078 @@
                                 7936D6A91C99F8AE000D1AED /* SmallPtrSet.h */,
                                 A30D412D1F0DE13F00B71954 /* SoftLinking.h */,
-                                79038E05224B05A7004C0738 /* SpanningTree.h */,
                                 A8A4730D151A825B004123FF /* Spectrum.h */,
                                 A8A4730E151A825B004123FF /* StackBounds.cpp */,

branches/safari-607.2.6.0-branch/Source/WTF/wtf/BackwardsGraph.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +30 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/SingleRootGraph.h>
-#include <wtf/SpanningTree.h>
 #include <wtf/StdLibExtras.h>
 
@@ -58 +57 @@
             }
         };
-
-        {
-            // Loops are a form of terminality (you can loop forever). To have a loop, you need to
-            // have a back edge. An edge u->v is a back edge when u is a descendent of v in the
-            // DFS spanning tree of the Graph.
-            SpanningTree<Graph> spanningTree(graph);
-            for (unsigned i = 0; i < graph.numNodes(); ++i) {
-                if (typename Graph::Node node = graph.node(i)) {
-                    for (typename Graph::Node successor : graph.successors(node)) {
-                        if (spanningTree.isDescendent(node, successor)) {
-                            addRootSuccessor(node);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
 
         for (unsigned i = 0; i < graph.numNodes(); ++i) {