Changeset 85761 in webkit

Timestamp:

May 4, 2011 11:00:44 AM (13 years ago)

Author:

ddkilzer@apple.com

Message:

Part 1 of 2: <​http://webkit.org/b/56337> Enable -Werror on ANGLE

Merge ANGLE upstream commits r572, r573, r574, r575.

This unblocks enabling -Werror on ANGLE. Since all changes are
in the upstream repository, they may be safely overwritten
during the next ANGLE update.

• src/compiler/ConstantUnion.h:

(ConstantUnion::operator==): Added a default case.

• src/compiler/Intermediate.cpp:

(TIntermBinary::promote): Added parentheses.

• src/compiler/ParseHelper.cpp:

(TParseContext::precisionErrorCheck): Added a default case.

• src/compiler/PoolAlloc.cpp:

(TAllocation::checkGuardBlock): Changed '%u' to '%lu' for size_t
variable. Put for loop inside #ifdef GUARD_BLOCKS/#endif macros
to fix tautological-compare warning.
(TAllocation::checkAllocList): Added newline to end of file.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/compiler/ConstantUnion.h (modified) (1 diff)
• src/compiler/Intermediate.cpp (modified) (2 diffs)
• src/compiler/ParseHelper.cpp (modified) (1 diff)
• src/compiler/PoolAlloc.cpp (modified) (2 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2011-05-04  David Kilzer  <ddkilzer@apple.com>
+
+        Part 1 of 2: <http://webkit.org/b/56337> Enable -Werror on ANGLE
+
+        Merge ANGLE upstream commits r572, r573, r574, r575.
+
+        This unblocks enabling -Werror on ANGLE.  Since all changes are
+        in the upstream repository, they may be safely overwritten
+        during the next ANGLE update.
+
+        * src/compiler/ConstantUnion.h:
+        (ConstantUnion::operator==): Added a default case.
+        * src/compiler/Intermediate.cpp:
+        (TIntermBinary::promote): Added parentheses.
+        * src/compiler/ParseHelper.cpp:
+        (TParseContext::precisionErrorCheck): Added a default case.
+        * src/compiler/PoolAlloc.cpp:
+        (TAllocation::checkGuardBlock): Changed '%u' to '%lu' for size_t
+        variable.  Put for loop inside #ifdef GUARD_BLOCKS/#endif macros
+        to fix tautological-compare warning.
+        (TAllocation::checkAllocList): Added newline to end of file.
+
 2011-04-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/compiler/ConstantUnion.h

@@ -70 +70 @@
 
             break;
+        default:
+            return false;
         }
 

trunk/Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp

@@ -1006 +1006 @@
         case EOpSubAssign:
         case EOpDivAssign:
-            if (left->isMatrix() && right->isVector() ||
-                left->isVector() && right->isMatrix())
+            if ((left->isMatrix() && right->isVector()) ||
+                (left->isVector() && right->isMatrix()))
                 return false;
             setType(TType(basicType, higherPrecision, EvqTemporary, size, left->isMatrix() || right->isMatrix()));
@@ -1018 +1018 @@
         case EOpLessThanEqual:
         case EOpGreaterThanEqual:
-            if (left->isMatrix() && right->isVector() ||
-                left->isVector() && right->isMatrix())
+            if ((left->isMatrix() && right->isVector()) ||
+                (left->isVector() && right->isMatrix()))
                 return false;
             setType(TType(EbtBool, EbpUndefined));

trunk/Source/ThirdParty/ANGLE/src/compiler/ParseHelper.cpp

@@ -275 +275 @@
         }
         break;
+    default:
+        return false;
     }
     return false;

trunk/Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.cpp

@@ -152 +152 @@
 void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, const char* locText) const
 {
+#ifdef GUARD_BLOCKS
     for (size_t x = 0; x < guardBlockSize; x++) {
         if (blockMem[x] != val) {
@@ -157 +158 @@
 
             // We don't print the assert message.  It's here just to be helpful.
-            sprintf(assertMsg, "PoolAlloc: Damage %s %u byte allocation at 0x%p\n",
+            sprintf(assertMsg, "PoolAlloc: Damage %s %lu byte allocation at 0x%p\n",
                     locText, size, data());
             assert(0 && "PoolAlloc: Damage in guard block");
         }
     }
+#endif
 }