Commit 43ab48a

alexmarkovCommit Queue

authored and

Commit Queue

committed

[vm] Improve error message 'Invalid kernel binary format version'

Add expected and actual kernel format versions to the error message. TEST=manual run 'dart incompatible.dill' Fixes #46938 Change-Id: I2e7ecde5558e3f62a78beab37cbcf51fd495d7c9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449021 Reviewed-by: Alexander Aprelev <aam@google.com> Commit-Queue: Alexander Markov <alexmarkov@google.com>

1 parent cc14696 commit 43ab48aCopy full SHA for 43ab48a

File tree

1 file changed

-2

lines changed

runtime/vm
- kernel_binary.cc

1 file changed

-2

lines changed

`‎runtime/vm/kernel_binary.cc‎`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ const char* kKernelInvalidFilesize =`
`68`	`68`	`"File size is too small to be a valid kernel file";`
`69`	`69`	`const char* kKernelInvalidMagicIdentifier = "Invalid magic identifier";`
`70`	`70`	`const char* kKernelInvalidBinaryFormatVersion =`
`71`		`- "Invalid kernel binary format version";`
	`71`	`+ "Invalid kernel binary format version (expected %" Pu32 ", found %" Pu32`
	`72`	`+ ")";`
`72`	`73`	`const char* kKernelInvalidSizeIndicated =`
`73`	`74`	`"Invalid kernel binary: Indicated size is invalid";`
`74`	`75`	`const char* kKernelInvalidSdkHash = "Invalid SDK hash";`
`@@ -119,7 +120,9 @@ std::unique_ptr<Program> Program::ReadFrom(Reader* reader, const char** error) {`
`119`	`120`	`const uint32_t format_version = reader->ReadUInt32();`
`120`	`121`	`if (format_version != kSupportedKernelFormatVersion) {`
`121`	`122`	`if (error != nullptr) {`
`122`		`- *error = kKernelInvalidBinaryFormatVersion;`
	`123`	`+ *error = OS::SCreate(Thread::Current()->zone(),`
	`124`	`+ kKernelInvalidBinaryFormatVersion,`
	`125`	`+ kSupportedKernelFormatVersion, format_version);`
`123`	`126`	`}`
`124`	`127`	`return nullptr;`
`125`	`128`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 43ab48a

File tree

1 file changed

1 file changed

`‎runtime/vm/kernel_binary.cc‎`

0 commit comments