Changeset 85621 in webkit

Timestamp:

May 3, 2011 10:34:15 AM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

2011-05-03 Xan Lopez <​xlopez@igalia.com>

Reviewed by Anders Carlsson.

Compile error with GCC 4.6.0, tries to assign unsigned& to bitfield
​https://bugs.webkit.org/show_bug.cgi?id=59261

Use unary '+' to force proper type detection in template arguments
with GCC 4.6.0. See bug report for more details.

• runtime/Structure.cpp: (JSC::StructureTransitionTable::remove): Use '+' to force precise type detection. (JSC::StructureTransitionTable::add): ditto.
• runtime/Structure.h: (JSC::StructureTransitionTable::keyForWeakGCMapFinalizer): ditto.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Structure.cpp (modified) (2 diffs)
• runtime/Structure.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-03  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Anders Carlsson.
+
+        Compile error with GCC 4.6.0, tries to assign unsigned& to bitfield
+        https://bugs.webkit.org/show_bug.cgi?id=59261
+
+        Use unary '+' to force proper type detection in template arguments
+        with GCC 4.6.0. See bug report for more details.
+
+        * runtime/Structure.cpp:
+        (JSC::StructureTransitionTable::remove): Use '+' to force precise type detection.
+        (JSC::StructureTransitionTable::add): ditto.
+        * runtime/Structure.h:
+        (JSC::StructureTransitionTable::keyForWeakGCMapFinalizer): ditto.
+
 2011-05-03  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -97 +97 @@
         // entry is structure (the latter check may fail if we initially had a
         // transition with a specific value, and this has been despecified).
-        TransitionMap::iterator entry = map()->find(make_pair(structure->m_nameInPrevious, structure->m_attributesInPrevious));
+
+        // Newer versions of the STL have an std::make_pair function that takes rvalue references.
+        // When either of the parameters are bitfields, the C++ compiler will try to bind them as lvalues, which is invalid. To work around this, use unary "+" to make the parameter an rvalue.
+        // See https://bugs.webkit.org/show_bug.cgi?id=59261 for more details
+        TransitionMap::iterator entry = map()->find(make_pair(structure->m_nameInPrevious, +structure->m_attributesInPrevious));
         if (entry != map()->end() && structure == entry.get().second)
             map()->remove(entry);
@@ -121 +125 @@
 
     // Add the structure to the map.
-    std::pair<TransitionMap::iterator, bool> result = map()->add(globalData, make_pair(structure->m_nameInPrevious, structure->m_attributesInPrevious), structure);
+
+    // Newer versions of the STL have an std::make_pair function that takes rvalue references.
+    // When either of the parameters are bitfields, the C++ compiler will try to bind them as lvalues, which is invalid. To work around this, use unary "+" to make the parameter an rvalue.
+    // See https://bugs.webkit.org/show_bug.cgi?id=59261 for more details
+    std::pair<TransitionMap::iterator, bool> result = map()->add(globalData, make_pair(structure->m_nameInPrevious, +structure->m_attributesInPrevious), structure);
     if (!result.second) {
         // There already is an entry! - we should only hit this when despecifying.

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -306 +306 @@
     inline StructureTransitionTable::Hash::Key StructureTransitionTable::keyForWeakGCMapFinalizer(void*, Structure* structure)
     {
-        return Hash::Key(structure->m_nameInPrevious.get(), structure->m_attributesInPrevious);
+        // Newer versions of the STL have an std::make_pair function that takes rvalue references.
+        // When either of the parameters are bitfields, the C++ compiler will try to bind them as lvalues, which is invalid. To work around this, use unary "+" to make the parameter an rvalue.
+        // See https://bugs.webkit.org/show_bug.cgi?id=59261 for more details.
+        return Hash::Key(structure->m_nameInPrevious.get(), +structure->m_attributesInPrevious);
     }