Fix RewriteElseBlocks using a non-prefixed struct name

src/compiler/translator/RewriteElseBlocks.cpp

@@ -84,12 +84,10 @@ TIntermNode *ElseBlockRewriter::rewriteIfElse(TIntermIfElse *ifElse)
         // returns (that are unreachable) we can silence this compile error.
         if (mFunctionType && mFunctionType->getBasicType() != EbtVoid)
         {
-            TString typeString = mFunctionType->getStruct() ? mFunctionType->getStruct()->name()
-                                                            : mFunctionType->getBasicString();
-            TString rawText        = "return (" + typeString + ")0";
-            TIntermRaw *returnNode = new TIntermRaw(*mFunctionType, rawText);
-            negatedElse            = new TIntermBlock();
-            negatedElse->getSequence()->push_back(returnNode);
+            TIntermNode *returnNode =
+                new TIntermBranch(EOpReturn, TIntermTyped::CreateZero(*mFunctionType));
+            negatedElse = new TIntermBlock();
+            negatedElse->appendStatement(returnNode);
         }
 
         TIntermSymbol *conditionSymbolElse = createTempSymbol(boolType);
@@ -109,7 +107,8 @@ TIntermNode *ElseBlockRewriter::rewriteIfElse(TIntermIfElse *ifElse)
 
     return block;
 }
-}
+
+}  // anonymous namespace
 
 void RewriteElseBlocks(TIntermNode *node, unsigned int *temporaryIndex)
 {
@@ -117,4 +116,5 @@ void RewriteElseBlocks(TIntermNode *node, unsigned int *temporaryIndex)
     rewriter.useTemporaryIndex(temporaryIndex);
     node->traverse(&rewriter);
 }
-}
+
+}  // namespace sh

src/tests/compiler_tests/HLSLOutput_test.cpp

@@ -20,6 +20,12 @@ class HLSLOutputTest : public MatchOutputCodeTest
     HLSLOutputTest() : MatchOutputCodeTest(GL_FRAGMENT_SHADER, 0, SH_HLSL_4_1_OUTPUT) {}
 };
 
+class HLSL30VertexOutputTest : public MatchOutputCodeTest
+{
+  public:
+    HLSL30VertexOutputTest() : MatchOutputCodeTest(GL_VERTEX_SHADER, 0, SH_HLSL_3_0_OUTPUT) {}
+};
+
 // Test that having dynamic indexing of a vector inside the right hand side of logical or doesn't
 // trigger asserts in HLSL output.
 TEST_F(HLSLOutputTest, DynamicIndexingOfVectorOnRightSideOfLogicalOr)
@@ -35,3 +41,34 @@ TEST_F(HLSLOutputTest, DynamicIndexingOfVectorOnRightSideOfLogicalOr)
         "}\n";
     compile(shaderString);
 }
+
+// Test that rewriting else blocks in a function that returns a struct doesn't use the struct name
+// without a prefix.
+TEST_F(HLSL30VertexOutputTest, RewriteElseBlockReturningStruct)
+{
+    const std::string &shaderString =
+        "struct foo\n"
+        "{\n"
+        "    float member;\n"
+        "};\n"
+        "uniform bool b;\n"
+        "foo getFoo()\n"
+        "{\n"
+        "    if (b)\n"
+        "    {\n"
+        "        return foo(0.0);\n"
+        "    }\n"
+        "    else\n"
+        "    {\n"
+        "        return foo(1.0);\n"
+        "    }\n"
+        "}\n"
+        "void main()\n"
+        "{\n"
+        "   gl_Position = vec4(getFoo().member);\n"
+        "}\n";
+    compile(shaderString);
+    EXPECT_TRUE(foundInCode("_foo"));
+    EXPECT_FALSE(foundInCode("(foo)"));
+    EXPECT_FALSE(foundInCode(" foo"));
+}