commit b116b997d02306a727e238e2d27b76b499c79c0b
author Ben Clayton <bclayton@google.com> Tue Aug 15 12:03:45 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 15 12:03:45 2023 +0000
tree 6a30d3f54a719ab29ad34291ae46288588c631ad
parent d0856122b2e0ffb11091c90c049a4d7d14d94b21

[tools][gen] Fix nil-deref on non-existent include

File() used to get-or-create. Now you need to call AddFile() first.

Change-Id: I5166258abe80f192bfec48e823d94459668af01b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/146900
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

tools/src/cmd/gen/build/build.go

diff --git a/tools/src/cmd/gen/build/build.go b/tools/src/cmd/gen/build/build.go
index 9e8395c..fc3554e 100644
--- a/tools/src/cmd/gen/build/build.go
+++ b/tools/src/cmd/gen/build/build.go
@@ -233,10 +233,10 @@
 					if strings.HasPrefix(include.path, srcTint) {
 						// #include "src/tint/..."
 						include.path = include.path[len(srcTint)+1:] // Strip 'src/tint/'
-						includeFile := p.File(include.path)
 
-						if _, err := os.Stat(includeFile.AbsPath()); err != nil {
-							return fmt.Errorf(`%v:%v includes non-existent file '%v'`, file.Path(), include.line, includeFile.AbsPath())
+						includeFile := p.File(include.path)
+						if includeFile == nil {
+							return fmt.Errorf(`%v:%v includes non-existent file '%v'`, file.Path(), include.line, include.path)
 						}
 
 						dependencyKind := targetKindFromFilename(include.path)