Skip to content

Commit d543267

Browse files
spencer-lunargspencer-lunarg
committed
spirv-val: Validate DebugSource Operands
1 parent 2b2db0b commit d543267

File tree

2 files changed

+454
-82
lines changed

2 files changed

+454
-82
lines changed

‎source/val/validate_extensions.cpp

+120-30
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "source/val/instruction.h"
3131
#include "source/val/validate.h"
3232
#include "source/val/validation_state.h"
33+
#include "spirv-tools/libspirv.h"
3334
#include "spirv/unified1/NonSemanticClspvReflection.h"
3435

3536
namespace spvtools {
@@ -283,6 +284,50 @@ spv_result_t ValidateOperandDebugType(
283284
<< " is not a valid debug type";
284285
}
285286

287+
spv_result_t ValidateOperandDebugSource(
288+
ValidationState_t& _, const Instruction* inst, uint32_t source_index,
289+
uint32_t line_index, uint32_t column_index,
290+
spv_ext_inst_type_t ext_inst_type,
291+
const std::function<std::string()>& ext_inst_name) {
292+
auto* debug_source_inst = _.FindDef(inst->word(source_index));
293+
const std::vector<uint32_t>& line_lengths =
294+
_.GetDebugSourceLineLength(debug_source_inst->id(), false);
295+
if (line_lengths.empty())
296+
return SPV_SUCCESS; // Text not provide in DebugSource
297+
298+
const bool vulkanDebugInfo =
299+
ext_inst_type == SPV_EXT_INST_TYPE_NONSEMANTIC_SHADER_DEBUGINFO_100;
300+
uint32_t line = 0;
301+
uint32_t column = 0;
302+
// NonSemantic uses OpConstant for all operands
303+
if (vulkanDebugInfo) {
304+
bool is_int32 = false, is_const_int32 = false;
305+
std::tie(is_int32, is_const_int32, line) =
306+
_.EvalInt32IfConst(inst->word(line_index));
307+
std::tie(is_int32, is_const_int32, column) =
308+
_.EvalInt32IfConst(inst->word(column_index));
309+
} else {
310+
line = inst->word(line_index);
311+
column = inst->word(column_index);
312+
}
313+
314+
if (line > line_lengths.size()) {
315+
return _.diag(SPV_ERROR_INVALID_DATA, inst)
316+
<< ext_inst_name() << ": operand Line (" << line
317+
<< ") is larger then the " << line_lengths.size()
318+
<< " lines found in the DebugSource text";
319+
} else if (line != 0) {
320+
const uint32_t line_length = line_lengths[line - 1];
321+
if (column > line_length) {
322+
return _.diag(SPV_ERROR_INVALID_DATA, inst)
323+
<< ext_inst_name() << ": operand Column End (" << column
324+
<< ") is larger then Line " << line << " column length of "
325+
<< line_length << " found in the DebugSource text";
326+
}
327+
}
328+
return SPV_SUCCESS;
329+
}
330+
286331
spv_result_t ValidateClspvReflectionKernel(ValidationState_t& _,
287332
const Instruction* inst,
288333
uint32_t version) {
@@ -1008,6 +1053,11 @@ spv_result_t ValidateClspvReflectionInstruction(ValidationState_t& _,
10081053
// inside
10091054
void BuildDebugSourceLineLength(ValidationState_t& _, const Instruction* inst,
10101055
uint32_t ext_inst_index) {
1056+
if (ext_inst_index == NonSemanticShaderDebugInfo100DebugSource &&
1057+
inst->words().size() < 7) {
1058+
return; // The optional text was not provided
1059+
}
1060+
10111061
const bool use_last_id =
10121062
ext_inst_index == NonSemanticShaderDebugInfo100DebugSourceContinued;
10131063

@@ -3304,38 +3354,39 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
33043354
auto* debug_source_inst = _.FindDef(inst->word(5));
33053355
const std::vector<uint32_t>& line_lengths =
33063356
_.GetDebugSourceLineLength(debug_source_inst->id(), false);
3307-
3308-
if (line_end > line_lengths.size()) {
3309-
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3310-
<< ext_inst_name() << ": operand Line End (" << line_end
3311-
<< ") is larger then the " << line_lengths.size()
3312-
<< " lines found in the DebugSource text";
3313-
}
3314-
if (line_start == line_end) {
3315-
const uint32_t columns = line_lengths[line_end - 1];
3316-
if (column_end > columns) {
3357+
if (!line_lengths.empty()) {
3358+
if (line_end > line_lengths.size()) {
33173359
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3318-
<< ext_inst_name() << ": operand Column End ("
3319-
<< column_end << ") is larger then Line " << line_end
3320-
<< " column length of " << columns
3321-
<< " found in the DebugSource text";
3360+
<< ext_inst_name() << ": operand Line End (" << line_end
3361+
<< ") is larger then the " << line_lengths.size()
3362+
<< " lines found in the DebugSource text";
33223363
}
3323-
} else {
3324-
uint32_t columns = line_lengths[line_start - 1];
3325-
if (column_start > columns) {
3326-
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3327-
<< ext_inst_name() << ": operand Column Start ("
3328-
<< column_start << ") is larger then Line " << line_start
3329-
<< " column length of " << columns
3330-
<< " found in the DebugSource text";
3331-
}
3332-
columns = line_lengths[line_end - 1];
3333-
if (column_end > columns) {
3334-
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3335-
<< ext_inst_name() << ": operand Column End ("
3336-
<< column_end << ") is larger then Line " << line_end
3337-
<< " column length of " << columns
3338-
<< " found in the DebugSource text";
3364+
if (line_start == line_end) {
3365+
const uint32_t line_length = line_lengths[line_end - 1];
3366+
if (column_end > line_length) {
3367+
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3368+
<< ext_inst_name() << ": operand Column End ("
3369+
<< column_end << ") is larger then Line " << line_end
3370+
<< " column length of " << line_length
3371+
<< " found in the DebugSource text";
3372+
}
3373+
} else {
3374+
uint32_t line_length = line_lengths[line_start - 1];
3375+
if (column_start > line_length) {
3376+
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3377+
<< ext_inst_name() << ": operand Column Start ("
3378+
<< column_start << ") is larger then Line " << line_start
3379+
<< " column length of " << line_length
3380+
<< " found in the DebugSource text";
3381+
}
3382+
line_length = line_lengths[line_end - 1];
3383+
if (column_end > line_length) {
3384+
return _.diag(SPV_ERROR_INVALID_DATA, inst)
3385+
<< ext_inst_name() << ": operand Column End ("
3386+
<< column_end << ") is larger then Line " << line_end
3387+
<< " column length of " << line_length
3388+
<< " found in the DebugSource text";
3389+
}
33393390
}
33403391
}
33413392

@@ -3519,6 +3570,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
35193570
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
35203571
CHECK_CONST_UINT_OPERAND("Line", 8);
35213572
CHECK_CONST_UINT_OPERAND("Column", 9);
3573+
if (auto error = ValidateOperandDebugSource(
3574+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3575+
return error;
3576+
35223577
auto validate_parent =
35233578
ValidateOperandLexicalScope(_, "Parent", inst, 10, ext_inst_name);
35243579
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3557,6 +3612,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
35573612
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
35583613
CHECK_CONST_UINT_OPERAND("Line", 8);
35593614
CHECK_CONST_UINT_OPERAND("Column", 9);
3615+
if (auto error = ValidateOperandDebugSource(
3616+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3617+
return error;
3618+
35603619
auto validate_parent =
35613620
ValidateOperandLexicalScope(_, "Parent", inst, 10, ext_inst_name);
35623621
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3580,6 +3639,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
35803639
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
35813640
CHECK_CONST_UINT_OPERAND("Line", 8);
35823641
CHECK_CONST_UINT_OPERAND("Column", 9);
3642+
if (auto error = ValidateOperandDebugSource(
3643+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3644+
return error;
3645+
35833646
auto validate_parent =
35843647
ValidateOperandLexicalScope(_, "Parent", inst, 10, ext_inst_name);
35853648
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3621,6 +3684,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
36213684
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
36223685
CHECK_CONST_UINT_OPERAND("Line", 8);
36233686
CHECK_CONST_UINT_OPERAND("Column", 9);
3687+
if (auto error = ValidateOperandDebugSource(
3688+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3689+
return error;
3690+
36243691
// NonSemantic.Shader.DebugInfo doesn't have the Parent operand
36253692
if (vulkanDebugInfo) {
36263693
CHECK_OPERAND("Offset", spv::Op::OpConstant, 10);
@@ -3673,6 +3740,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
36733740
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
36743741
CHECK_CONST_UINT_OPERAND("Line", 8);
36753742
CHECK_CONST_UINT_OPERAND("Column", 9);
3743+
if (auto error = ValidateOperandDebugSource(
3744+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3745+
return error;
3746+
36763747
auto validate_parent =
36773748
ValidateOperandLexicalScope(_, "Parent", inst, 10, ext_inst_name);
36783749
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3708,6 +3779,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
37083779
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
37093780
CHECK_CONST_UINT_OPERAND("Line", 8);
37103781
CHECK_CONST_UINT_OPERAND("Column", 9);
3782+
if (auto error = ValidateOperandDebugSource(
3783+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3784+
return error;
3785+
37113786
auto validate_parent =
37123787
ValidateOperandLexicalScope(_, "Parent", inst, 10, ext_inst_name);
37133788
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3719,6 +3794,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
37193794
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 5);
37203795
CHECK_CONST_UINT_OPERAND("Line", 6);
37213796
CHECK_CONST_UINT_OPERAND("Column", 7);
3797+
if (auto error = ValidateOperandDebugSource(
3798+
_, inst, 5, 6, 7, ext_inst_type, ext_inst_name))
3799+
return error;
3800+
37223801
auto validate_parent =
37233802
ValidateOperandLexicalScope(_, "Parent", inst, 8, ext_inst_name);
37243803
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3744,6 +3823,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
37443823
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
37453824
CHECK_CONST_UINT_OPERAND("Line", 8);
37463825
CHECK_CONST_UINT_OPERAND("Column", 9);
3826+
if (auto error = ValidateOperandDebugSource(
3827+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3828+
return error;
3829+
37473830
auto validate_parent =
37483831
ValidateOperandLexicalScope(_, "Parent", inst, 10, ext_inst_name);
37493832
if (validate_parent != SPV_SUCCESS) return validate_parent;
@@ -3823,6 +3906,9 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
38233906
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 8);
38243907
CHECK_CONST_UINT_OPERAND("Line", 9);
38253908
CHECK_CONST_UINT_OPERAND("Column", 10);
3909+
if (auto error = ValidateOperandDebugSource(
3910+
_, inst, 8, 9, 10, ext_inst_type, ext_inst_name))
3911+
return error;
38263912
break;
38273913
}
38283914
case CommonDebugInfoDebugGlobalVariable: {
@@ -3833,6 +3919,10 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
38333919
CHECK_DEBUG_OPERAND("Source", CommonDebugInfoDebugSource, 7);
38343920
CHECK_CONST_UINT_OPERAND("Line", 8);
38353921
CHECK_CONST_UINT_OPERAND("Column", 9);
3922+
if (auto error = ValidateOperandDebugSource(
3923+
_, inst, 7, 8, 9, ext_inst_type, ext_inst_name))
3924+
return error;
3925+
38363926
auto validate_scope =
38373927
ValidateOperandLexicalScope(_, "Scope", inst, 10, ext_inst_name);
38383928
if (validate_scope != SPV_SUCCESS) return validate_scope;

0 commit comments

Comments
 (0)