mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Non-functional: Attempt to reset Travis error, while adding more nullptr use.

Browse Source 
Top of master is listing a test error, not from glslang, but internally
within Travis itself.  Seeing if another run gets it to work again.
This commit is contained in:
John Kessenich 2017-06-19 16:25:44 -06:00
parent 2fcdd64e50
commit f02c8e6ba1
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hlsl/hlslParseHelper.cpp
View File

@ -693,7 +693,7 @@ TIntermTyped* HlslParseContext::handleVariable(const TSourceLoc& loc, const TStr
} }
// Recovery, if it wasn't found or was not a variable. // Recovery, if it wasn't found or was not a variable.
if (! variable) { if (variable == nullptr) {
error(loc, "unknown variable", string->c_str(), ""); error(loc, "unknown variable", string->c_str(), "");
variable = new TVariable(string, TType(EbtVoid)); variable = new TVariable(string, TType(EbtVoid));
} }
@ -867,7 +867,7 @@ void HlslParseContext::checkIndex(const TSourceLoc& /*loc*/, const TType& /*type
TIntermTyped* HlslParseContext::handleBinaryMath(const TSourceLoc& loc, const char* str, TOperator op, TIntermTyped* left, TIntermTyped* right) TIntermTyped* HlslParseContext::handleBinaryMath(const TSourceLoc& loc, const char* str, TOperator op, TIntermTyped* left, TIntermTyped* right)
{ {
TIntermTyped* result = intermediate.addBinaryMath(op, left, right, loc); TIntermTyped* result = intermediate.addBinaryMath(op, left, right, loc);
if (! result) if (result == nullptr)
binaryOpError(loc, str, left->getCompleteString(), right->getCompleteString()); binaryOpError(loc, str, left->getCompleteString(), right->getCompleteString());
return result; return result;
@ -1664,7 +1664,7 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l
TSymbol* symbol = symbolTable.find(function.getMangledName()); TSymbol* symbol = symbolTable.find(function.getMangledName());
TFunction* prevDec = symbol ? symbol->getAsFunction() : nullptr; TFunction* prevDec = symbol ? symbol->getAsFunction() : nullptr;
if (! prevDec) if (prevDec == nullptr)
error(loc, "can't find function", function.getName().c_str(), ""); error(loc, "can't find function", function.getName().c_str(), "");
// Note: 'prevDec' could be 'function' if this is the first time we've seen function // Note: 'prevDec' could be 'function' if this is the first time we've seen function
// as it would have just been put in the symbol table. Otherwise, we're looking up // as it would have just been put in the symbol table. Otherwise, we're looking up
@ -3031,7 +3031,7 @@ TIntermConstantUnion* HlslParseContext::getSamplePosArray(int count)
// //
void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermTyped*& node, TIntermNode* arguments) void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermTyped*& node, TIntermNode* arguments)
{ {
if (!node || !node->getAsOperator()) if (node == nullptr || !node->getAsOperator())
return; return;
const auto clampReturn = [&loc, &node, this](TIntermTyped* result, const TSampler& sampler) -> TIntermTyped* { const auto clampReturn = [&loc, &node, this](TIntermTyped* result, const TSampler& sampler) -> TIntermTyped* {
@ -3773,7 +3773,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
// //
void HlslParseContext::decomposeGeometryMethods(const TSourceLoc& loc, TIntermTyped*& node, TIntermNode* arguments) void HlslParseContext::decomposeGeometryMethods(const TSourceLoc& loc, TIntermTyped*& node, TIntermNode* arguments)
{ {
if (!node || !node->getAsOperator()) if (node == nullptr || !node->getAsOperator())
return; return;
const TOperator op = node->getAsOperator()->getOp(); const TOperator op = node->getAsOperator()->getOp();
@ -4967,7 +4967,7 @@ void HlslParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fn
} }
if (arg > 0) { if (arg > 0) {
if (! aggArgs[arg]->getAsConstantUnion()) if (aggArgs[arg]->getAsConstantUnion() == nullptr)
error(loc, "argument must be compile-time constant", "texel offset", ""); error(loc, "argument must be compile-time constant", "texel offset", "");
else { else {
const TType& type = aggArgs[arg]->getAsTyped()->getType(); const TType& type = aggArgs[arg]->getAsTyped()->getType();
@ -5706,7 +5706,7 @@ void HlslParseContext::arrayDimMerge(TType& type, const TArraySizes* sizes)
// //
void HlslParseContext::declareArray(const TSourceLoc& loc, const TString& identifier, const TType& type, TSymbol*& symbol, bool track) void HlslParseContext::declareArray(const TSourceLoc& loc, const TString& identifier, const TType& type, TSymbol*& symbol, bool track)
{ {
if (! symbol) { if (symbol == nullptr) {
bool currentScope; bool currentScope;
symbol = symbolTable.find(identifier, nullptr, &currentScope); symbol = symbolTable.find(identifier, nullptr, &currentScope);
@ -5737,7 +5737,7 @@ void HlslParseContext::declareArray(const TSourceLoc& loc, const TString& identi
// Process a redeclaration. // Process a redeclaration.
// //
if (! symbol) { if (symbol == nullptr) {
error(loc, "array variable name expected", identifier.c_str(), ""); error(loc, "array variable name expected", identifier.c_str(), "");
return; return;
} }
@ -5856,7 +5856,7 @@ void HlslParseContext::redeclareBuiltinBlock(const TSourceLoc& loc, TTypeList& n
// If the block was not found, this must be a version/profile/stage // If the block was not found, this must be a version/profile/stage
// that doesn't have it, or the instance name is wrong. // that doesn't have it, or the instance name is wrong.
const char* errorName = instanceName ? instanceName->c_str() : newTypeList.front().type->getFieldName().c_str(); const char* errorName = instanceName ? instanceName->c_str() : newTypeList.front().type->getFieldName().c_str();
if (! block) { if (block == nullptr) {
error(loc, "no declaration found for redeclaration", errorName, ""); error(loc, "no declaration found for redeclaration", errorName, "");
return; return;
} }
@ -6967,7 +6967,7 @@ TIntermNode* HlslParseContext::declareVariable(const TSourceLoc& loc, const TStr
declareArray(loc, identifier, type, symbol, !flattenVar); declareArray(loc, identifier, type, symbol, !flattenVar);
} else { } else {
// non-array case // non-array case
if (! symbol) if (symbol == nullptr)
symbol = declareNonArray(loc, identifier, type, !flattenVar); symbol = declareNonArray(loc, identifier, type, !flattenVar);
else if (type != symbol->getType()) else if (type != symbol->getType())
error(loc, "cannot change the type of", "redeclaration", symbol->getName().c_str()); error(loc, "cannot change the type of", "redeclaration", symbol->getName().c_str());
@ -6976,7 +6976,7 @@ TIntermNode* HlslParseContext::declareVariable(const TSourceLoc& loc, const TStr
if (flattenVar) if (flattenVar)
flatten(loc, *symbol->getAsVariable()); flatten(loc, *symbol->getAsVariable());
if (! symbol) if (symbol == nullptr)
return nullptr; return nullptr;
// Deal with initializer // Deal with initializer
@ -6986,7 +6986,7 @@ TIntermNode* HlslParseContext::declareVariable(const TSourceLoc& loc, const TStr
error(loc, "flattened array with initializer list unsupported", identifier.c_str(), ""); error(loc, "flattened array with initializer list unsupported", identifier.c_str(), "");
TVariable* variable = symbol->getAsVariable(); TVariable* variable = symbol->getAsVariable();
if (! variable) { if (variable == nullptr) {
error(loc, "initializer requires a variable, not a member", identifier.c_str(), ""); error(loc, "initializer requires a variable, not a member", identifier.c_str(), "");
return nullptr; return nullptr;
} }
@ -7082,7 +7082,7 @@ TIntermNode* HlslParseContext::executeInitializer(const TSourceLoc& loc, TInterm
skeletalType.getQualifier().makeTemporary(); skeletalType.getQualifier().makeTemporary();
if (initializer->getAsAggregate() && initializer->getAsAggregate()->getOp() == EOpNull) if (initializer->getAsAggregate() && initializer->getAsAggregate()->getOp() == EOpNull)
initializer = convertInitializerList(loc, skeletalType, initializer, nullptr); initializer = convertInitializerList(loc, skeletalType, initializer, nullptr);
if (! initializer) { if (initializer == nullptr) {
// error recovery; don't leave const without constant values // error recovery; don't leave const without constant values
if (qualifier == EvqConst) if (qualifier == EvqConst)
variable->getWritableType().getQualifier().storage = EvqTemporary; variable->getWritableType().getQualifier().storage = EvqTemporary;
@ -7145,7 +7145,7 @@ TIntermNode* HlslParseContext::executeInitializer(const TSourceLoc& loc, TInterm
specializationCheck(loc, initializer->getType(), "initializer"); specializationCheck(loc, initializer->getType(), "initializer");
TIntermSymbol* intermSymbol = intermediate.addSymbol(*variable, loc); TIntermSymbol* intermSymbol = intermediate.addSymbol(*variable, loc);
TIntermNode* initNode = handleAssign(loc, EOpAssign, intermSymbol, initializer); TIntermNode* initNode = handleAssign(loc, EOpAssign, intermSymbol, initializer);
if (! initNode) if (initNode == nullptr)
assignError(loc, "=", intermSymbol->getCompleteString(), initializer->getCompleteString()); assignError(loc, "=", intermSymbol->getCompleteString(), initializer->getCompleteString());
return initNode; return initNode;
@ -7175,7 +7175,7 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co
// see if we have bottomed out in the tree within the initializer-list part // see if we have bottomed out in the tree within the initializer-list part
TIntermAggregate* initList = initializer->getAsAggregate(); TIntermAggregate* initList = initializer->getAsAggregate();
if (! initList || initList->getOp() != EOpNull) { if (initList == nullptr || initList->getOp() != EOpNull) {
// We don't have a list, but if it's a scalar and the 'type' is a // We don't have a list, but if it's a scalar and the 'type' is a
// composite, we need to lengthen below to make it useful. // composite, we need to lengthen below to make it useful.
// Otherwise, this is an already formed object to initialize with. // Otherwise, this is an already formed object to initialize with.
@ -7643,7 +7643,7 @@ TIntermTyped* HlslParseContext::constructAggregate(TIntermNode* node, const TTyp
{ {
// Handle cases that map more 1:1 between constructor arguments and constructed. // Handle cases that map more 1:1 between constructor arguments and constructed.
TIntermTyped* converted = intermediate.addConversion(EOpConstructStruct, type, node->getAsTyped()); TIntermTyped* converted = intermediate.addConversion(EOpConstructStruct, type, node->getAsTyped());
if (! converted || converted->getType() != type) { if (converted == nullptr || converted->getType() != type) {
error(loc, "", "constructor", "cannot convert parameter %d from '%s' to '%s'", paramCount, error(loc, "", "constructor", "cannot convert parameter %d from '%s' to '%s'", paramCount,
node->getAsTyped()->getType().getCompleteString().c_str(), type.getCompleteString().c_str()); node->getAsTyped()->getType().getCompleteString().c_str(), type.getCompleteString().c_str());
@ -7796,7 +7796,7 @@ void HlslParseContext::declareBlock(const TSourceLoc& loc, TType& type, const TS
// Add the variable, as anonymous or named instanceName. // Add the variable, as anonymous or named instanceName.
// Make an anonymous variable if no name was provided. // Make an anonymous variable if no name was provided.
if (! instanceName) if (instanceName == nullptr)
instanceName = NewPoolTString(""); instanceName = NewPoolTString("");
TVariable& variable = *new TVariable(instanceName, blockType); TVariable& variable = *new TVariable(instanceName, blockType);
@ -7946,7 +7946,7 @@ void HlslParseContext::fixBlockUniformOffsets(const TQualifier& qualifier, TType
void HlslParseContext::addQualifierToExisting(const TSourceLoc& loc, TQualifier qualifier, const TString& identifier) void HlslParseContext::addQualifierToExisting(const TSourceLoc& loc, TQualifier qualifier, const TString& identifier)
{ {
TSymbol* symbol = symbolTable.find(identifier); TSymbol* symbol = symbolTable.find(identifier);
if (! symbol) { if (symbol == nullptr) {
error(loc, "identifier not previously declared", identifier.c_str(), ""); error(loc, "identifier not previously declared", identifier.c_str(), "");
return; return;
} }