Fix null check after addUnaryMath is called for a built-in function

src/compiler/translator/glslang.y

@@ -353,6 +353,13 @@ function_call
                         // Treat it like a built-in unary operator.
                         //
                         $$ = context->intermediate.addUnaryMath(op, $1.intermNode, @1);
+                        if ($$ == 0)  {
+                            std::stringstream extraInfoStream;
+                            extraInfoStream << "built in unary operator function.  Type: " << static_cast<TIntermTyped*>($1.intermNode)->getCompleteString();
+                            std::string extraInfo = extraInfoStream.str();
+                            context->error($1.intermNode->getLine(), " wrong operand type", "Internal Error", extraInfo.c_str());
+                            YYERROR;
+                        }
                         const TType& returnType = fnCandidate->getReturnType();
                         if (returnType.getBasicType() == EbtBool) {
                             // Bool types should not have precision, so we'll override any precision
@@ -362,13 +369,6 @@ function_call
                             // addUnaryMath has set the precision of the node based on the operand.
                             $$->setTypePreservePrecision(returnType);
                         }
-                        if ($$ == 0)  {
-                            std::stringstream extraInfoStream;
-                            extraInfoStream << "built in unary operator function.  Type: " << static_cast<TIntermTyped*>($1.intermNode)->getCompleteString();
-                            std::string extraInfo = extraInfoStream.str();
-                            context->error($1.intermNode->getLine(), " wrong operand type", "Internal Error", extraInfo.c_str());
-                            YYERROR;
-                        }
                     } else {
                         TIntermAggregate *aggregate = context->intermediate.setAggregateOperator($1.intermAggregate, op, @1);
                         aggregate->setType(fnCandidate->getReturnType());

src/compiler/translator/glslang_tab.cpp

@@ -2505,6 +2505,13 @@ yyreduce:
                         // Treat it like a built-in unary operator.
                         //
                         (yyval.interm.intermTypedNode) = context->intermediate.addUnaryMath(op, (yyvsp[0].interm).intermNode, (yylsp[0]));
+                        if ((yyval.interm.intermTypedNode) == 0)  {
+                            std::stringstream extraInfoStream;
+                            extraInfoStream << "built in unary operator function.  Type: " << static_cast<TIntermTyped*>((yyvsp[0].interm).intermNode)->getCompleteString();
+                            std::string extraInfo = extraInfoStream.str();
+                            context->error((yyvsp[0].interm).intermNode->getLine(), " wrong operand type", "Internal Error", extraInfo.c_str());
+                            YYERROR;
+                        }
                         const TType& returnType = fnCandidate->getReturnType();
                         if (returnType.getBasicType() == EbtBool) {
                             // Bool types should not have precision, so we'll override any precision
@@ -2514,13 +2521,6 @@ yyreduce:
                             // addUnaryMath has set the precision of the node based on the operand.
                             (yyval.interm.intermTypedNode)->setTypePreservePrecision(returnType);
                         }
-                        if ((yyval.interm.intermTypedNode) == 0)  {
-                            std::stringstream extraInfoStream;
-                            extraInfoStream << "built in unary operator function.  Type: " << static_cast<TIntermTyped*>((yyvsp[0].interm).intermNode)->getCompleteString();
-                            std::string extraInfo = extraInfoStream.str();
-                            context->error((yyvsp[0].interm).intermNode->getLine(), " wrong operand type", "Internal Error", extraInfo.c_str());
-                            YYERROR;
-                        }
                     } else {
                         TIntermAggregate *aggregate = context->intermediate.setAggregateOperator((yyvsp[0].interm).intermAggregate, op, (yylsp[0]));
                         aggregate->setType(fnCandidate->getReturnType());