commit 2be2d5ae67aaa9b0ae6a5072c88001ad846812bb
author Olli Etuaho <oetuaho@nvidia.com> Thu Jan 26 16:34:30 2017 -0800
committer Commit Bot <commit-bot@chromium.org> Tue Jan 31 16:57:14 2017 +0000
tree e1a3811849e587f2b636730e39d32a837c35ddf3
parent 1ecd14b875f110b9c94c2dc34c219fb3267ee51a

Clean up unary node creation

When createUnaryNode() is called, the child node is guaranteed to be
non-null. This enables simplifying it.

BUG=angleproject:1490
TEST=angle_unittests

Change-Id: Ib1d021bbbeab99a6bf1b1be470181e9efbe301c6
Reviewed-on: https://chromium-review.googlesource.com/433467
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 918dd85..8904c5c 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -3658,13 +3658,9 @@
 
 TIntermTyped *TParseContext::createUnaryMath(TOperator op,
                                              TIntermTyped *child,
-                                             const TSourceLoc &loc,
-                                             const TType *funcReturnType)
+                                             const TSourceLoc &loc)
 {
-    if (child == nullptr)
-    {
-        return nullptr;
-    }
+    ASSERT(child != nullptr);
 
     switch (op)
     {
@@ -3672,6 +3668,7 @@
             if (child->getBasicType() != EbtBool || child->isMatrix() || child->isArray() ||
                 child->isVector())
             {
+                unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
                 return nullptr;
             }
             break;
@@ -3679,6 +3676,7 @@
             if ((child->getBasicType() != EbtInt && child->getBasicType() != EbtUInt) ||
                 child->isMatrix() || child->isArray())
             {
+                unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
                 return nullptr;
             }
             break;
@@ -3691,6 +3689,7 @@
             if (child->getBasicType() == EbtStruct || child->getBasicType() == EbtBool ||
                 child->isArray() || IsOpaqueType(child->getBasicType()))
             {
+                unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
                 return nullptr;
             }
         // Operators for built-ins are already type checked against their prototype.
@@ -3710,10 +3709,9 @@
 
 TIntermTyped *TParseContext::addUnaryMath(TOperator op, TIntermTyped *child, const TSourceLoc &loc)
 {
-    TIntermTyped *node = createUnaryMath(op, child, loc, nullptr);
+    TIntermTyped *node = createUnaryMath(op, child, loc);
     if (node == nullptr)
     {
-        unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
         return child;
     }
     return node;
@@ -4409,27 +4407,13 @@
             op = fnCandidate->getBuiltInOp();
             if (builtIn && op != EOpNull)
             {
-                //
                 // A function call mapped to a built-in operation.
-                //
                 if (fnCandidate->getParamCount() == 1)
                 {
-                    //
                     // Treat it like a built-in unary operator.
-                    //
                     TIntermNode *unaryParamNode = argumentsNode->getSequence()->front();
-                    callNode = createUnaryMath(op, unaryParamNode->getAsTyped(), loc,
-                                               &fnCandidate->getReturnType());
-                    if (callNode == nullptr)
-                    {
-                        std::stringstream reasonStream;
-                        reasonStream
-                            << "wrong operand type for built in unary function: "
-                            << static_cast<TIntermTyped *>(argumentsNode)->getCompleteString();
-                        std::string reason = reasonStream.str();
-                        error(argumentsNode->getLine(), reason.c_str(), "Internal Error");
-                        return TIntermTyped::CreateZero(TType(EbtFloat, EbpMedium, EvqConst));
-                    }
+                    callNode = createUnaryMath(op, unaryParamNode->getAsTyped(), loc);
+                    ASSERT(callNode != nullptr);
                 }
                 else
                 {