Merge pull request #1103 from KhronosGroup/fix-1100
MSL: Cleanup temporary use with emit_uninitialized_temporary.
diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
index d5b2db7..f83f7c6 100644
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -5285,7 +5285,6 @@
case GLSLstd450ModfStruct:
{
- forced_temporaries.insert(id);
auto &type = get<SPIRType>(result_type);
emit_uninitialized_temporary_expression(result_type, id);
statement(to_expression(id), ".", to_member_name(type, 0), " = ", "modf(", to_expression(args[0]), ", ",
@@ -5425,7 +5424,6 @@
case GLSLstd450FrexpStruct:
{
- forced_temporaries.insert(id);
auto &type = get<SPIRType>(result_type);
emit_uninitialized_temporary_expression(result_type, id);
statement(to_expression(id), ".", to_member_name(type, 0), " = ", "frexp(", to_expression(args[0]), ", ",
@@ -8533,7 +8531,6 @@
uint32_t result_id = ops[1];
uint32_t op0 = ops[2];
uint32_t op1 = ops[3];
- forced_temporaries.insert(result_id);
auto &type = get<SPIRType>(result_type);
emit_uninitialized_temporary_expression(result_type, result_id);
const char *op = opcode == OpUMulExtended ? "umulExtended" : "imulExtended";
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
index a4f911c..7b6b070 100644
--- a/spirv_msl.cpp
+++ b/spirv_msl.cpp
@@ -4649,10 +4649,8 @@
uint32_t result_id = ops[1];
uint32_t op0 = ops[2];
uint32_t op1 = ops[3];
- forced_temporaries.insert(result_id);
auto &type = get<SPIRType>(result_type);
- statement(variable_decl(type, to_name(result_id)), ";");
- set<SPIRExpression>(result_id, to_name(result_id), result_type, true);
+ emit_uninitialized_temporary_expression(result_type, result_id);
auto &res_type = get<SPIRType>(type.member_types[1]);
if (opcode == OpIAddCarry)
@@ -4681,10 +4679,8 @@
uint32_t result_id = ops[1];
uint32_t op0 = ops[2];
uint32_t op1 = ops[3];
- forced_temporaries.insert(result_id);
auto &type = get<SPIRType>(result_type);
- statement(variable_decl(type, to_name(result_id)), ";");
- set<SPIRExpression>(result_id, to_name(result_id), result_type, true);
+ emit_uninitialized_temporary_expression(result_type, result_id);
statement(to_expression(result_id), ".", to_member_name(type, 0), " = ", to_enclosed_expression(op0), " * ",
to_enclosed_expression(op1), ";");
@@ -4966,8 +4962,6 @@
uint32_t mem_order_2, bool has_mem_order_2, uint32_t obj, uint32_t op1,
bool op1_is_pointer, bool op1_is_literal, uint32_t op2)
{
- forced_temporaries.insert(result_id);
-
string exp = string(op) + "(";
auto &type = get_pointee_type(expression_type(obj));
@@ -5006,12 +5000,11 @@
// the CAS loop, otherwise it will loop infinitely, with the comparison test always failing.
// The function updates the comparitor value from the memory value, so the additional
// comparison test evaluates the memory value against the expected value.
- statement(variable_decl(type, to_name(result_id)), ";");
+ emit_uninitialized_temporary_expression(result_type, result_id);
statement("do");
begin_scope();
statement(to_name(result_id), " = ", to_expression(op1), ";");
end_scope_decl(join("while (!", exp, " && ", to_name(result_id), " == ", to_enclosed_expression(op1), ")"));
- set<SPIRExpression>(result_id, to_name(result_id), result_type, true);
}
else
{
