Skip to content

Commit 43ab48a

Browse files
alexmarkovCommit Queue
authored andcommitted
[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 <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent cc14696 commit 43ab48a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

runtime/vm/kernel_binary.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ const char* kKernelInvalidFilesize =
6868
"File size is too small to be a valid kernel file";
6969
const char* kKernelInvalidMagicIdentifier = "Invalid magic identifier";
7070
const char* kKernelInvalidBinaryFormatVersion =
71-
"Invalid kernel binary format version";
71+
"Invalid kernel binary format version (expected %" Pu32 ", found %" Pu32
72+
")";
7273
const char* kKernelInvalidSizeIndicated =
7374
"Invalid kernel binary: Indicated size is invalid";
7475
const char* kKernelInvalidSdkHash = "Invalid SDK hash";
@@ -119,7 +120,9 @@ std::unique_ptr<Program> Program::ReadFrom(Reader* reader, const char** error) {
119120
const uint32_t format_version = reader->ReadUInt32();
120121
if (format_version != kSupportedKernelFormatVersion) {
121122
if (error != nullptr) {
122-
*error = kKernelInvalidBinaryFormatVersion;
123+
*error = OS::SCreate(Thread::Current()->zone(),
124+
kKernelInvalidBinaryFormatVersion,
125+
kSupportedKernelFormatVersion, format_version);
123126
}
124127
return nullptr;
125128
}

0 commit comments

Comments
 (0)