This is an archive of the discontinued LLVM Phabricator instance.

Differential D124672

[lldb] Define LLDB_VERSION_PATCH correctly
ClosedPublic

Authored by dim on Apr 29 2022, 6:24 AM.

Details

Reviewers
JDevlieghere
labath
Commits
rG7abfaa0a815a: [lldb] Define LLDB_VERSION_PATCH correctly
Summary

In commit ccf1469a4cdb lldb got its own generated Version.inc file, with
LLDB_VERSION macros. However, it used LLDB_VERSION_PATCHLEVEL
instead of the actually correct LLDB_VERSION_PATCH. Correct this.

Diff Detail

Unit TestsFailed

TimeTest
60,030 msx64 debian > MLIR.Examples/standalone::test.toy
60,040 msx64 debian > libFuzzer.libFuzzer::large.test

Event Timeline

dim created this revision.Apr 29 2022, 6:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 29 2022, 6:24 AM
dim requested review of this revision.Apr 29 2022, 6:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 29 2022, 6:24 AM
Harbormaster completed remote builds in B161973: Diff 426040.Apr 29 2022, 6:29 AM
JDevlieghere accepted this revision.Apr 29 2022, 8:22 AM

Good catch. Seems like there's another reference to this in llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn but otherwise LGTM.

This revision is now accepted and ready to land.Apr 29 2022, 8:22 AM
dim updated this revision to Diff 426110.Apr 29 2022, 10:29 AM

Add llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn while we're here.

Herald added a project: Restricted Project. · View Herald TranscriptApr 29 2022, 10:29 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
This revision was landed with ongoing or failed builds.Apr 29 2022, 10:31 AM
Closed by commit rG7abfaa0a815a: [lldb] Define LLDB_VERSION_PATCH correctly (authored by dim). · Explain Why
This revision was automatically updated to reflect the committed changes.
dim added a commit: rG7abfaa0a815a: [lldb] Define LLDB_VERSION_PATCH correctly.
Harbormaster completed remote builds in B162030: Diff 426110.Apr 29 2022, 1:04 PM

Revision Contents

PathSize
lldb/
include/
lldb/
Version/
2 lines
llvm/
utils/
gn/
secondary/
lldb/
include/
lldb/
Version/
2 lines

Diff 426110

lldb/include/lldb/Version/Version.inc.in

#define LLDB_VERSION @LLDB_VERSION@ #define LLDB_VERSION @LLDB_VERSION@
#define LLDB_VERSION_STRING "@LLDB_VERSION@" #define LLDB_VERSION_STRING "@LLDB_VERSION@"
#define LLDB_VERSION_MAJOR @LLDB_VERSION_MAJOR@ #define LLDB_VERSION_MAJOR @LLDB_VERSION_MAJOR@
#define LLDB_VERSION_MINOR @LLDB_VERSION_MINOR@ #define LLDB_VERSION_MINOR @LLDB_VERSION_MINOR@
#define LLDB_VERSION_PATCHLEVEL @LLDB_VERSION_PATCHLEVEL@ #define LLDB_VERSION_PATCH @LLDB_VERSION_PATCH@
#cmakedefine LLDB_FULL_VERSION_STRING "@LLDB_FULL_VERSION_STRING@" #cmakedefine LLDB_FULL_VERSION_STRING "@LLDB_FULL_VERSION_STRING@"

llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn

import("//llvm/utils/gn/build/write_cmake_config.gni") import("//llvm/utils/gn/build/write_cmake_config.gni")
import("//llvm/version.gni") import("//llvm/version.gni")
# Configure the Version.inc file. # Configure the Version.inc file.
write_cmake_config("version") { write_cmake_config("version") {
input = "Version.inc.in" input = "Version.inc.in"
output = "$target_gen_dir/Version.inc" output = "$target_gen_dir/Version.inc"
values = [ values = [
"LLDB_VERSION=$llvm_version", "LLDB_VERSION=$llvm_version",
"LLDB_VERSION_MAJOR=$llvm_version_major", "LLDB_VERSION_MAJOR=$llvm_version_major",
"LLDB_VERSION_MINOR=$llvm_version_minor", "LLDB_VERSION_MINOR=$llvm_version_minor",
"LLDB_VERSION_PATCHLEVEL=$llvm_version_patch", "LLDB_VERSION_PATCH=$llvm_version_patch",
"LLDB_FULL_VERSION_STRING=", "LLDB_FULL_VERSION_STRING=",
] ]
} }