Changeset 226725 in webkit for trunk/Source/JavaScriptCore/runtime/FunctionExecutable.h

Timestamp:

Jan 10, 2018, 11:41:12 AM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r226667 and r226673.
​https://bugs.webkit.org/show_bug.cgi?id=181488

This caused a flaky crash. (Requested by mlewis13 on #webkit).

Reverted changesets:

"CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226667

"REGRESSION (r226667): CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226673

File:

• trunk/Source/JavaScriptCore/runtime/FunctionExecutable.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/FunctionExecutable.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#include "ExecutableToCodeBlockEdge.h"
 #include "ScriptExecutable.h"
 #include "SourceCode.h"
@@ -70 +69 @@
     FunctionCodeBlock* eitherCodeBlock()
     {
-        ExecutableToCodeBlockEdge* edge;
         if (m_codeBlockForCall)
-            edge = m_codeBlockForCall.get();
-        else
-            edge = m_codeBlockForConstruct.get();
-        return bitwise_cast<FunctionCodeBlock*>(ExecutableToCodeBlockEdge::unwrap(edge));
+            return m_codeBlockForCall.get();
+        return m_codeBlockForConstruct.get();
     }
         
@@ -85 +81 @@
     FunctionCodeBlock* codeBlockForCall()
     {
-        return bitwise_cast<FunctionCodeBlock*>(ExecutableToCodeBlockEdge::unwrap(m_codeBlockForCall.get()));
+        return m_codeBlockForCall.get();
     }
 
     bool isGeneratedForConstruct() const
     {
-        return !!m_codeBlockForConstruct;
+        return m_codeBlockForConstruct.get();
     }
 
     FunctionCodeBlock* codeBlockForConstruct()
     {
-        return bitwise_cast<FunctionCodeBlock*>(ExecutableToCodeBlockEdge::unwrap(m_codeBlockForConstruct.get()));
+        return m_codeBlockForConstruct.get();
     }
         
@@ -209 +205 @@
     unsigned m_parametersStartOffset;
     WriteBarrier<UnlinkedFunctionExecutable> m_unlinkedExecutable;
-    WriteBarrier<ExecutableToCodeBlockEdge> m_codeBlockForCall;
-    WriteBarrier<ExecutableToCodeBlockEdge> m_codeBlockForConstruct;
+    WriteBarrier<FunctionCodeBlock> m_codeBlockForCall;
+    WriteBarrier<FunctionCodeBlock> m_codeBlockForConstruct;
     RefPtr<TypeSet> m_returnStatementTypeSet;
     WriteBarrier<InferredValue> m_singletonFunction;