Skip to content

A
angle
Commit 72d1020e by Olli Etuaho Committed by Commit Bot
Options

Refactor function call node creation

This makes function call node creation code simpler and more type safe. It also prepares for further simplification by removing usage of TFunction in places where the arguments node is sufficient. BUG=angleproject:1490 TEST=angle_unittests Change-Id: I75d9e059bb32c475487f0be24e40ac0d78012d86 Reviewed-on: https://chromium-review.googlesource.com/433217Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent 9250cb24
Showing with 68 additions and 177 deletions
src/compiler/translator/EmulatePrecision.cpp
...@@ -429,8 +429,7 @@ bool canRoundFloat(const TType &type) ...@@ -429,8 +429,7 @@ bool canRoundFloat(const TType &type)
TIntermAggregate *createInternalFunctionCallNode(TString name, TIntermNode *child) TIntermAggregate *createInternalFunctionCallNode(TString name, TIntermNode *child)
{ {
TIntermAggregate *callNode = new TIntermAggregate(); TIntermAggregate *callNode = new TIntermAggregate(EOpFunctionCall);
callNode->setOp(EOpFunctionCall);
TName nameObj(TFunction::mangleName(name)); TName nameObj(TFunction::mangleName(name));
nameObj.setInternal(true); nameObj.setInternal(true);
callNode->getFunctionSymbolInfo()->setNameObj(nameObj); callNode->getFunctionSymbolInfo()->setNameObj(nameObj);
......
src/compiler/translator/IntermNode.h
...@@ -136,6 +136,15 @@ struct TIntermNodePair ...@@ -136,6 +136,15 @@ struct TIntermNodePair
}; };
// //
// This is just to help yacc.
//
struct TIntermFunctionCallOrMethod
{
TIntermAggregate *argumentsNode;
TIntermNode *thisNode;
};
//
// Intermediate class for nodes that have a type. // Intermediate class for nodes that have a type.
// //
class TIntermTyped : public TIntermNode class TIntermTyped : public TIntermNode
...@@ -579,13 +588,6 @@ class TIntermAggregateBase ...@@ -579,13 +588,6 @@ class TIntermAggregateBase
class TIntermAggregate : public TIntermOperator, public TIntermAggregateBase class TIntermAggregate : public TIntermOperator, public TIntermAggregateBase
{ {
public: public:
TIntermAggregate()
: TIntermOperator(EOpNull),
mUserDefined(false),
mUseEmulatedFunction(false),
mGotPrecisionFromChildren(false)
{
}
TIntermAggregate(TOperator op) TIntermAggregate(TOperator op)
: TIntermOperator(op), : TIntermOperator(op),
mUserDefined(false), mUserDefined(false),
......
src/compiler/translator/Intermediate.cpp
...@@ -67,97 +67,6 @@ TIntermTyped *TIntermediate::addIndex(TOperator op, ...@@ -67,97 +67,6 @@ TIntermTyped *TIntermediate::addIndex(TOperator op,
return node; return node;
} }
// This is the safe way to change the operator on an aggregate, as it
// does lots of error checking and fixing. Especially for establishing
// a function call's operation on it's set of parameters.
//
// Returns an aggregate node, which could be the one passed in if
// it was already an aggregate but no operator was set.
TIntermAggregate *TIntermediate::setAggregateOperator(TIntermNode *node,
TOperator op,
const TSourceLoc &line)
{
TIntermAggregate *aggNode;
//
// Make sure we have an aggregate. If not turn it into one.
//
if (node)
{
aggNode = node->getAsAggregate();
if (aggNode == NULL || aggNode->getOp() != EOpNull)
{
//
// Make an aggregate containing this node.
//
aggNode = new TIntermAggregate();
aggNode->getSequence()->push_back(node);
}
}
else
{
aggNode = new TIntermAggregate();
}
//
// Set the operator.
//
aggNode->setOp(op);
aggNode->setLine(line);
return aggNode;
}
//
// Safe way to combine two nodes into an aggregate. Works with null pointers,
// a node that's not a aggregate yet, etc.
//
// Returns the resulting aggregate, unless 0 was passed in for
// both existing nodes.
//
TIntermAggregate *TIntermediate::growAggregate(TIntermNode *left,
TIntermNode *right,
const TSourceLoc &line)
{
if (left == NULL && right == NULL)
return NULL;
TIntermAggregate *aggNode = NULL;
if (left)
aggNode = left->getAsAggregate();
if (!aggNode || aggNode->getOp() != EOpNull)
{
aggNode = new TIntermAggregate;
if (left)
aggNode->getSequence()->push_back(left);
}
if (right)
aggNode->getSequence()->push_back(right);
aggNode->setLine(line);
return aggNode;
}
//
// Turn an existing node into an aggregate.
//
// Returns an aggregate, unless NULL was passed in for the existing node.
//
TIntermAggregate *TIntermediate::MakeAggregate(TIntermNode *node, const TSourceLoc &line)
{
if (node == nullptr)
return nullptr;
TIntermAggregate *aggNode = new TIntermAggregate;
aggNode->getSequence()->push_back(node);
aggNode->setLine(line);
return aggNode;
}
// If the input node is nullptr, return nullptr. // If the input node is nullptr, return nullptr.
// If the input node is a block node, return it. // If the input node is a block node, return it.
// If the input node is not a block node, put it inside a block node and return that. // If the input node is not a block node, put it inside a block node and return that.
......
src/compiler/translator/Intermediate.h
...@@ -33,14 +33,7 @@ class TIntermediate ...@@ -33,14 +33,7 @@ class TIntermediate
TIntermTyped *index, TIntermTyped *index,
const TSourceLoc &line, const TSourceLoc &line,
TDiagnostics *diagnostics); TDiagnostics *diagnostics);
TIntermTyped *addUnaryMath(TOperator op,
TIntermTyped *child,
const TSourceLoc &line,
const TType *funcReturnType);
TIntermAggregate *growAggregate(TIntermNode *left, TIntermNode *right, const TSourceLoc &);
static TIntermAggregate *MakeAggregate(TIntermNode *node, const TSourceLoc &line);
static TIntermBlock *EnsureBlock(TIntermNode *node); static TIntermBlock *EnsureBlock(TIntermNode *node);
TIntermAggregate *setAggregateOperator(TIntermNode *, TOperator, const TSourceLoc &);
TIntermNode *addIfElse(TIntermTyped *cond, TIntermNodePair code, const TSourceLoc &line); TIntermNode *addIfElse(TIntermTyped *cond, TIntermNodePair code, const TSourceLoc &line);
static TIntermTyped *AddTernarySelection(TIntermTyped *cond, static TIntermTyped *AddTernarySelection(TIntermTyped *cond,
TIntermTyped *trueExpression, TIntermTyped *trueExpression,
......
src/compiler/translator/ParseContext.h
...@@ -112,8 +112,7 @@ class TParseContext : angle::NonCopyable ...@@ -112,8 +112,7 @@ class TParseContext : angle::NonCopyable
void checkIsScalarInteger(TIntermTyped *node, const char *token); void checkIsScalarInteger(TIntermTyped *node, const char *token);
bool checkIsAtGlobalLevel(const TSourceLoc &line, const char *token); bool checkIsAtGlobalLevel(const TSourceLoc &line, const char *token);
bool checkConstructorArguments(const TSourceLoc &line, bool checkConstructorArguments(const TSourceLoc &line,
TIntermNode *argumentsNode, const TIntermAggregate *argumentsNode,
const TFunction &function,
TOperator op, TOperator op,
const TType &type); const TType &type);
...@@ -253,9 +252,9 @@ class TParseContext : angle::NonCopyable ...@@ -253,9 +252,9 @@ class TParseContext : angle::NonCopyable
const TString *name, const TString *name,
const TSourceLoc &location); const TSourceLoc &location);
TFunction *addConstructorFunc(const TPublicType &publicType); TFunction *addConstructorFunc(const TPublicType &publicType);
TIntermTyped *addConstructor(TIntermNode *arguments, TIntermTyped *addConstructor(TIntermAggregate *arguments,
TOperator op, TOperator op,
TFunction *fnCall, TType type,
const TSourceLoc &line); const TSourceLoc &line);
TIntermTyped *addIndexExpression(TIntermTyped *baseExpression, TIntermTyped *addIndexExpression(TIntermTyped *baseExpression,
...@@ -346,11 +345,14 @@ class TParseContext : angle::NonCopyable ...@@ -346,11 +345,14 @@ class TParseContext : angle::NonCopyable
void checkImageMemoryAccessForBuiltinFunctions(TIntermAggregate *functionCall); void checkImageMemoryAccessForBuiltinFunctions(TIntermAggregate *functionCall);
void checkImageMemoryAccessForUserDefinedFunctions(const TFunction *functionDefinition, void checkImageMemoryAccessForUserDefinedFunctions(const TFunction *functionDefinition,
const TIntermAggregate *functionCall); const TIntermAggregate *functionCall);
TIntermAggregate *createEmptyArgumentsNode(const TSourceLoc &loc);
// fnCall is only storing the built-in op, and function name or constructor type. argumentsNode
// has the arguments.
TIntermTyped *addFunctionCallOrMethod(TFunction *fnCall, TIntermTyped *addFunctionCallOrMethod(TFunction *fnCall,
TIntermNode *paramNode, TIntermAggregate *argumentsNode,
TIntermNode *thisNode, TIntermNode *thisNode,
const TSourceLoc &loc, const TSourceLoc &loc);
bool *fatalError);
TIntermTyped *addTernarySelection(TIntermTyped *cond, TIntermTyped *addTernarySelection(TIntermTyped *cond,
TIntermTyped *trueExpression, TIntermTyped *trueExpression,
......
src/compiler/translator/Types.h
...@@ -484,7 +484,6 @@ class TType ...@@ -484,7 +484,6 @@ class TType
private: private:
void invalidateMangledName() { mangled = ""; } void invalidateMangledName() { mangled = ""; }
TString buildMangledName() const; TString buildMangledName() const;
size_t getStructSize() const;
TBasicType type; TBasicType type;
TPrecision precision; TPrecision precision;
......
src/compiler/translator/glslang.y
...@@ -76,6 +76,7 @@ using namespace sh; ...@@ -76,6 +76,7 @@ using namespace sh;
union { union {
TIntermNode *intermNode; TIntermNode *intermNode;
TIntermNodePair nodePair; TIntermNodePair nodePair;
TIntermFunctionCallOrMethod callOrMethodPair;
TIntermTyped *intermTypedNode; TIntermTyped *intermTypedNode;
TIntermAggregate *intermAggregate; TIntermAggregate *intermAggregate;
TIntermBlock *intermBlock; TIntermBlock *intermBlock;
...@@ -314,24 +315,19 @@ integer_expression ...@@ -314,24 +315,19 @@ integer_expression
function_call function_call
: function_call_or_method { : function_call_or_method {
bool fatalError = false; $$ = context->addFunctionCallOrMethod($1.function, $1.callOrMethodPair.argumentsNode, $1.callOrMethodPair.thisNode, @1);
$$ = context->addFunctionCallOrMethod($1.function, $1.nodePair.node1, $1.nodePair.node2, @1, &fatalError);
if (fatalError)
{
YYERROR;
}
} }
; ;
function_call_or_method function_call_or_method
: function_call_generic { : function_call_generic {
$$ = $1; $$ = $1;
$$.nodePair.node2 = nullptr; $$.callOrMethodPair.thisNode = nullptr;
} }
| postfix_expression DOT function_call_generic { | postfix_expression DOT function_call_generic {
ES3_OR_NEWER("", @3, "methods"); ES3_OR_NEWER("", @3, "methods");
$$ = $3; $$ = $3;
$$.nodePair.node2 = $1; $$.callOrMethodPair.thisNode = $1;
} }
; ;
...@@ -347,26 +343,23 @@ function_call_generic ...@@ -347,26 +343,23 @@ function_call_generic
function_call_header_no_parameters function_call_header_no_parameters
: function_call_header VOID_TYPE { : function_call_header VOID_TYPE {
$$.function = $1; $$.function = $1;
$$.nodePair.node1 = nullptr; $$.callOrMethodPair.argumentsNode = context->createEmptyArgumentsNode(@1);
} }
| function_call_header { | function_call_header {
$$.function = $1; $$.function = $1;
$$.nodePair.node1 = nullptr; $$.callOrMethodPair.argumentsNode = context->createEmptyArgumentsNode(@1);
} }
; ;
function_call_header_with_parameters function_call_header_with_parameters
: function_call_header assignment_expression { : function_call_header assignment_expression {
const TType *type = new TType($2->getType()); $$.callOrMethodPair.argumentsNode = context->createEmptyArgumentsNode(@1);
$1->addParameter(TConstParameter(type));
$$.function = $1; $$.function = $1;
$$.nodePair.node1 = TIntermediate::MakeAggregate($2, @2); $$.callOrMethodPair.argumentsNode->getSequence()->push_back($2);
} }
| function_call_header_with_parameters COMMA assignment_expression { | function_call_header_with_parameters COMMA assignment_expression {
const TType *type = new TType($3->getType());
$1.function->addParameter(TConstParameter(type));
$$.function = $1.function; $$.function = $1.function;
$$.nodePair.node1 = context->intermediate.growAggregate($1.intermNode, $3, @2); $$.callOrMethodPair.argumentsNode->getSequence()->push_back($3);
} }
; ;
......
src/compiler/translator/glslang_tab.cpp
...@@ -308,6 +308,7 @@ union YYSTYPE ...@@ -308,6 +308,7 @@ union YYSTYPE
union { union {
TIntermNode *intermNode; TIntermNode *intermNode;
TIntermNodePair nodePair; TIntermNodePair nodePair;
TIntermFunctionCallOrMethod callOrMethodPair;
TIntermTyped *intermTypedNode; TIntermTyped *intermTypedNode;
TIntermAggregate *intermAggregate; TIntermAggregate *intermAggregate;
TIntermBlock *intermBlock; TIntermBlock *intermBlock;
...@@ -737,36 +738,36 @@ static const yytype_uint8 yytranslate[] = ...@@ -737,36 +738,36 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 245, 245, 246, 249, 259, 262, 267, 272, 277, 0, 246, 246, 247, 250, 260, 263, 268, 273, 278,
282, 288, 291, 294, 297, 300, 303, 309, 316, 327, 283, 289, 292, 295, 298, 301, 304, 310, 317, 323,
331, 339, 342, 348, 352, 359, 365, 374, 382, 388, 327, 335, 338, 344, 348, 355, 360, 367, 375, 381,
394, 403, 406, 409, 412, 422, 423, 424, 425, 433, 387, 396, 399, 402, 405, 415, 416, 417, 418, 426,
434, 437, 440, 447, 448, 451, 457, 458, 462, 469, 427, 430, 433, 440, 441, 444, 450, 451, 455, 462,
470, 473, 476, 479, 485, 486, 489, 495, 496, 503, 463, 466, 469, 472, 478, 479, 482, 488, 489, 496,
504, 511, 512, 519, 520, 526, 527, 533, 534, 540, 497, 504, 505, 512, 513, 519, 520, 526, 527, 533,
541, 547, 548, 555, 556, 557, 558, 562, 563, 564, 534, 540, 541, 548, 549, 550, 551, 555, 556, 557,
568, 572, 576, 580, 587, 590, 596, 603, 610, 613, 561, 565, 569, 573, 580, 583, 589, 596, 603, 606,
616, 625, 629, 633, 637, 641, 648, 655, 658, 665, 609, 618, 622, 626, 630, 634, 641, 648, 651, 658,
673, 693, 703, 711, 736, 740, 744, 748, 755, 762, 666, 686, 696, 704, 729, 733, 737, 741, 748, 755,
765, 769, 773, 778, 783, 790, 794, 798, 802, 807, 758, 762, 766, 771, 776, 783, 787, 791, 795, 800,
812, 819, 823, 829, 832, 838, 842, 849, 855, 859, 805, 812, 816, 822, 825, 831, 835, 842, 848, 852,
863, 866, 869, 878, 884, 892, 895, 915, 934, 941, 856, 859, 862, 871, 877, 885, 888, 908, 927, 934,
945, 949, 952, 955, 958, 961, 964, 972, 979, 982, 938, 942, 945, 948, 951, 954, 957, 965, 972, 975,
985, 991, 998, 1001, 1007, 1010, 1013, 1016, 1022, 1025, 978, 984, 991, 994, 1000, 1003, 1006, 1009, 1015, 1018,
1030, 1041, 1044, 1047, 1050, 1053, 1056, 1060, 1064, 1068, 1023, 1034, 1037, 1040, 1043, 1046, 1049, 1053, 1057, 1061,
1072, 1076, 1080, 1084, 1088, 1092, 1096, 1100, 1104, 1108, 1065, 1069, 1073, 1077, 1081, 1085, 1089, 1093, 1097, 1101,
1112, 1116, 1120, 1124, 1128, 1132, 1136, 1140, 1143, 1146, 1105, 1109, 1113, 1117, 1121, 1125, 1129, 1133, 1136, 1139,
1149, 1152, 1155, 1158, 1161, 1164, 1167, 1170, 1173, 1176, 1142, 1145, 1148, 1151, 1154, 1157, 1160, 1163, 1166, 1169,
1179, 1182, 1185, 1188, 1191, 1194, 1201, 1207, 1210, 1213, 1172, 1175, 1178, 1181, 1184, 1187, 1194, 1200, 1203, 1206,
1216, 1219, 1222, 1225, 1228, 1231, 1234, 1237, 1240, 1243, 1209, 1212, 1215, 1218, 1221, 1224, 1227, 1230, 1233, 1236,
1246, 1258, 1258, 1261, 1261, 1267, 1270, 1276, 1279, 1286, 1239, 1251, 1251, 1254, 1254, 1260, 1263, 1269, 1272, 1279,
1290, 1296, 1302, 1314, 1318, 1322, 1323, 1329, 1330, 1331, 1283, 1289, 1295, 1307, 1311, 1315, 1316, 1322, 1323, 1324,
1332, 1333, 1334, 1335, 1339, 1340, 1340, 1340, 1349, 1350, 1325, 1326, 1327, 1328, 1332, 1333, 1333, 1333, 1342, 1343,
1354, 1354, 1355, 1355, 1360, 1363, 1372, 1377, 1384, 1385, 1347, 1347, 1348, 1348, 1353, 1356, 1365, 1370, 1377, 1378,
1389, 1396, 1400, 1407, 1407, 1414, 1417, 1424, 1428, 1441, 1382, 1389, 1393, 1400, 1400, 1407, 1410, 1417, 1421, 1434,
1441, 1446, 1446, 1452, 1452, 1460, 1463, 1469, 1472, 1478, 1434, 1439, 1439, 1445, 1445, 1453, 1456, 1462, 1465, 1471,
1482, 1489, 1492, 1495, 1498, 1501, 1510, 1516, 1522, 1525, 1475, 1482, 1485, 1488, 1491, 1494, 1503, 1509, 1515, 1518,
1531, 1531 1524, 1524
}; };
#endif #endif
...@@ -2618,12 +2619,7 @@ yyreduce: ...@@ -2618,12 +2619,7 @@ yyreduce:
case 18: case 18:
{ {
bool fatalError = false; (yyval.interm.intermTypedNode) = context->addFunctionCallOrMethod((yyvsp[0].interm).function, (yyvsp[0].interm).callOrMethodPair.argumentsNode, (yyvsp[0].interm).callOrMethodPair.thisNode, (yylsp[0]));
(yyval.interm.intermTypedNode) = context->addFunctionCallOrMethod((yyvsp[0].interm).function, (yyvsp[0].interm).nodePair.node1, (yyvsp[0].interm).nodePair.node2, (yylsp[0]), &fatalError);
if (fatalError)
{
YYERROR;
}
} }
break; break;
...@@ -2632,7 +2628,7 @@ yyreduce: ...@@ -2632,7 +2628,7 @@ yyreduce:
{ {
(yyval.interm) = (yyvsp[0].interm); (yyval.interm) = (yyvsp[0].interm);
(yyval.interm).nodePair.node2 = nullptr; (yyval.interm).callOrMethodPair.thisNode = nullptr;
} }
break; break;
...@@ -2642,7 +2638,7 @@ yyreduce: ...@@ -2642,7 +2638,7 @@ yyreduce:
{ {
ES3_OR_NEWER("", (yylsp[0]), "methods"); ES3_OR_NEWER("", (yylsp[0]), "methods");
(yyval.interm) = (yyvsp[0].interm); (yyval.interm) = (yyvsp[0].interm);
(yyval.interm).nodePair.node2 = (yyvsp[-2].interm.intermTypedNode); (yyval.interm).callOrMethodPair.thisNode = (yyvsp[-2].interm.intermTypedNode);
} }
break; break;
...@@ -2667,7 +2663,7 @@ yyreduce: ...@@ -2667,7 +2663,7 @@ yyreduce:
{ {
(yyval.interm).function = (yyvsp[-1].interm.function); (yyval.interm).function = (yyvsp[-1].interm.function);
(yyval.interm).nodePair.node1 = nullptr; (yyval.interm).callOrMethodPair.argumentsNode = context->createEmptyArgumentsNode((yylsp[-1]));
} }
break; break;
...@@ -2676,7 +2672,7 @@ yyreduce: ...@@ -2676,7 +2672,7 @@ yyreduce:
{ {
(yyval.interm).function = (yyvsp[0].interm.function); (yyval.interm).function = (yyvsp[0].interm.function);
(yyval.interm).nodePair.node1 = nullptr; (yyval.interm).callOrMethodPair.argumentsNode = context->createEmptyArgumentsNode((yylsp[0]));
} }
break; break;
...@@ -2684,10 +2680,9 @@ yyreduce: ...@@ -2684,10 +2680,9 @@ yyreduce:
case 25: case 25:
{ {
const TType *type = new TType((yyvsp[0].interm.intermTypedNode)->getType()); (yyval.interm).callOrMethodPair.argumentsNode = context->createEmptyArgumentsNode((yylsp[-1]));
(yyvsp[-1].interm.function)->addParameter(TConstParameter(type));
(yyval.interm).function = (yyvsp[-1].interm.function); (yyval.interm).function = (yyvsp[-1].interm.function);
(yyval.interm).nodePair.node1 = TIntermediate::MakeAggregate((yyvsp[0].interm.intermTypedNode), (yylsp[0])); (yyval.interm).callOrMethodPair.argumentsNode->getSequence()->push_back((yyvsp[0].interm.intermTypedNode));
} }
break; break;
...@@ -2695,10 +2690,8 @@ yyreduce: ...@@ -2695,10 +2690,8 @@ yyreduce:
case 26: case 26:
{ {
const TType *type = new TType((yyvsp[0].interm.intermTypedNode)->getType());
(yyvsp[-2].interm).function->addParameter(TConstParameter(type));
(yyval.interm).function = (yyvsp[-2].interm).function; (yyval.interm).function = (yyvsp[-2].interm).function;
(yyval.interm).nodePair.node1 = context->intermediate.growAggregate((yyvsp[-2].interm).intermNode, (yyvsp[0].interm.intermTypedNode), (yylsp[-1])); (yyval.interm).callOrMethodPair.argumentsNode->getSequence()->push_back((yyvsp[0].interm.intermTypedNode));
} }
break; break;
......
src/compiler/translator/glslang_tab.h
...@@ -220,6 +220,7 @@ union YYSTYPE { ...@@ -220,6 +220,7 @@ union YYSTYPE {
union { union {
TIntermNode *intermNode; TIntermNode *intermNode;
TIntermNodePair nodePair; TIntermNodePair nodePair;
TIntermFunctionCallOrMethod callOrMethodPair;
TIntermTyped *intermTypedNode; TIntermTyped *intermTypedNode;
TIntermAggregate *intermAggregate; TIntermAggregate *intermAggregate;
TIntermBlock *intermBlock; TIntermBlock *intermBlock;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment