Changeset 195800 in webkit

Timestamp:

Jan 28, 2016 9:37:44 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

[B3] REGRESSION(r195395): testComplex(64, 128) asserts on Linux with GCC
​https://bugs.webkit.org/show_bug.cgi?id=153422

Reviewed by Filip Pizlo.

Previously proc.values() returns ValuesCollection (Not reference!).
values.values takes const ValueCollection&.
And later it produces IndexSet<Value>::Iterable<Procedure::ValuesCollection>,
it holds const ValueCollection& as its member.
But IndexSet<Value>::Iterable<Procedure::ValuesCollection> is just an instance.
So after creating this, the lifetime of the ValueCollection const reference finished.

To fix that, we hold ValuesCollection as a member of Procedure.
And change the signature to const ValuesCollection& Procedure::values().

• b3/B3Procedure.cpp:

(JSC::B3::Procedure::Procedure):

• b3/B3Procedure.h:

(JSC::B3::Procedure::values):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/B3Procedure.cpp (modified) (1 diff)
• b3/B3Procedure.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-28  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [B3] REGRESSION(r195395): testComplex(64, 128) asserts on Linux with GCC
+        https://bugs.webkit.org/show_bug.cgi?id=153422
+
+        Reviewed by Filip Pizlo.
+
+        Previously proc.values() returns ValuesCollection (Not reference!).
+        values.values takes const ValueCollection&.
+        And later it produces IndexSet<Value>::Iterable<Procedure::ValuesCollection>,
+        it holds const ValueCollection& as its member.
+        But IndexSet<Value>::Iterable<Procedure::ValuesCollection> is just an instance.
+        So after creating this, the lifetime of the ValueCollection const reference finished.
+
+        To fix that, we hold ValuesCollection as a member of Procedure.
+        And change the signature to const ValuesCollection& Procedure::values().
+
+        * b3/B3Procedure.cpp:
+        (JSC::B3::Procedure::Procedure):
+        * b3/B3Procedure.h:
+        (JSC::B3::Procedure::values):
+
 2016-01-28  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/b3/B3Procedure.cpp

@@ -47 +47 @@
     , m_byproducts(std::make_unique<OpaqueByproducts>())
     , m_code(new Air::Code(*this))
+    , m_valuesCollection(*this)
 {
 }

trunk/Source/JavaScriptCore/b3/B3Procedure.h

@@ -313 +313 @@
     };
 
-    ValuesCollection values() const { return ValuesCollection(*this); }
+    const ValuesCollection& values() const { return m_valuesCollection; }
 
     void deleteValue(Value*);
@@ -383 +383 @@
     RefPtr<SharedTask<void(PrintStream&, Origin)>> m_originPrinter;
     const void* m_frontendData;
+    ValuesCollection m_valuesCollection;
 };