Skip to content

Commit 1e0a895

Browse files
committed
Eliminates more warnings treated as errors.
1 parent dce73df commit 1e0a895

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

tools/clang/lib/SPIRV/SpirvEmitter.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -756,8 +756,8 @@ llvm::StringRef SpirvEmitter::getEntryPointName(const FunctionInfo *entryInfo) {
756756
}
757757

758758
SpirvInstruction *
759-
SpirvEmitter::getAttrIntArg(ArrayRef<const DeclRefExpr *> exprs, int argNum,
760-
unsigned fallback) {
759+
SpirvEmitter::getAttrIntArg(ArrayRef<const DeclRefExpr *> exprs,
760+
unsigned argNum, unsigned fallback) {
761761
if (argNum < exprs.size()) {
762762
if (exprs[argNum]) {
763763
if (SpirvConstant *spvConst = constEvaluator.tryToEvaluateAsConst(
@@ -11180,7 +11180,6 @@ SpirvInstruction *SpirvEmitter::processIntrinsicGetBufferContents(
1118011180

1118111181
SpirvInstruction *SpirvEmitter::processIntrinsicExtractRecordStruct(
1118211182
const CXXMemberCallExpr *callExpr) {
11183-
SourceLocation loc = callExpr->getExprLoc();
1118411183
Expr *obj = callExpr->getImplicitObjectArgument();
1118511184
QualType objType = obj->getType();
1118611185
unsigned n = callExpr->getNumArgs();
@@ -11229,7 +11228,6 @@ SpirvEmitter::processIntrinsicIsValid(const CXXMemberCallExpr *callExpr) {
1122911228

1123011229
const auto *declRefExpr = dyn_cast<DeclRefExpr>(baseExpr->IgnoreImpCasts());
1123111230
const auto *paramDecl = dyn_cast<ParmVarDecl>(declRefExpr->getDecl());
11232-
const auto *nodeId = paramDecl->getAttr<HLSLNodeIdAttr>();
1123311231
int nodeIndex = 0;
1123411232
if (HLSLNodeIdAttr *nodeId = paramDecl->getAttr<HLSLNodeIdAttr>()) {
1123511233
nodeIndex = nodeId->getArrayIndex();
@@ -11282,8 +11280,6 @@ SpirvInstruction *SpirvEmitter::processIntrinsicGetNodeOutputRecords(
1128211280
}
1128311281
}
1128411282

11285-
QualType structType =
11286-
hlsl::GetHLSLNodeIOResultType(astContext, baseExpr->getType());
1128711283
LowerTypeVisitor lowerTypeVisitor(astContext, spvContext, spirvOptions,
1128811284
spvBuilder);
1128911285
const SpirvType *elemType = lowerTypeVisitor.lowerType(
@@ -11321,8 +11317,6 @@ SpirvInstruction *SpirvEmitter::processIntrinsicFinishedCrossGroupSharing(
1132111317
const CXXMemberCallExpr *callExpr) {
1132211318
Expr *payloadExpr = callExpr->getImplicitObjectArgument();
1132311319
SpirvInstruction *payload = doExpr(payloadExpr);
11324-
QualType type =
11325-
hlsl::GetHLSLNodeIOResultType(astContext, payloadExpr->getType());
1132611320
return spvBuilder.createFinishWritingNodePayload(payload,
1132711321
callExpr->getExprLoc());
1132811322
}
@@ -14487,7 +14481,7 @@ SpirvFunction *SpirvEmitter::emitEntryFunctionWrapper(
1448714481
if (hlsl::IsHLSLNodeInputType(paramType)) {
1448814482
SpirvInstruction *value = nullptr;
1448914483
if (!declIdMapper.createStageInputVar(param, &value, false))
14490-
return false;
14484+
return nullptr;
1449114485
if (value && value->getKind() == SpirvInstruction::Kind::IK_Variable) {
1449214486
handleNodePayloadArrayType(param, value);
1449314487
params.push_back(value);

tools/clang/lib/SPIRV/SpirvEmitter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ class SpirvEmitter : public ASTConsumer {
473473
SourceRange range = {});
474474

475475
SpirvInstruction *getAttrIntArg(ArrayRef<const DeclRefExpr *> exprs,
476-
int argNum, unsigned fallback);
476+
unsigned argNum, unsigned fallback);
477477

478478
private:
479479
/// Processes HLSL instrinsic functions.

0 commit comments

Comments
 (0)