Skip to content

Commit 70e66f5

Browse files
committed
move constant to better align with pr#134597
1 parent a76acec commit 70e66f5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ const DW_ATE_unsigned: c_uint = 0x07;
7373
#[allow(non_upper_case_globals)]
7474
const DW_ATE_UTF: c_uint = 0x10;
7575

76+
#[allow(non_upper_case_globals)]
77+
const DW_TAG_const_type: c_uint = 0x26;
78+
7679
pub(super) const UNKNOWN_LINE_NUMBER: c_uint = 0;
7780
pub(super) const UNKNOWN_COLUMN_NUMBER: c_uint = 0;
7881

compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use crate::common::{AsCCharPtr, CodegenCx};
1515
use crate::debuginfo::metadata::enums::DiscrResult;
1616
use crate::debuginfo::metadata::type_map::{self, Stub, UniqueTypeId};
1717
use crate::debuginfo::metadata::{
18-
DINodeCreationResult, NO_GENERICS, NO_SCOPE_METADATA, SmallVec, UNKNOWN_LINE_NUMBER,
19-
build_field_di_node, file_metadata, file_metadata_from_def_id, size_and_align_of, type_di_node,
18+
DINodeCreationResult, DW_TAG_const_type, NO_GENERICS, NO_SCOPE_METADATA, SmallVec,
19+
UNKNOWN_LINE_NUMBER, build_field_di_node, file_metadata, size_and_align_of, type_di_node,
2020
unknown_file_metadata, visibility_di_flags,
2121
};
2222
use crate::debuginfo::utils::DIB;
@@ -580,11 +580,10 @@ fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
580580
let ty_u64 = Ty::new_uint(cx.tcx, ty::UintTy::U64);
581581
(type_di_node(cx, ty_u64), Align::EIGHT.bits() as u32)
582582
};
583-
const DW_TAG_CONST_TYPE: c_uint = 0x0026;
584583

585584
// must wrap type in a `const` modifier for LLDB to be able to inspect the value of the member
586585
let field_type =
587-
llvm::LLVMRustDIBuilderCreateQualifiedType(DIB(cx), DW_TAG_CONST_TYPE, t_di);
586+
llvm::LLVMRustDIBuilderCreateQualifiedType(DIB(cx), DW_TAG_const_type, t_di);
588587

589588
llvm::LLVMRustDIBuilderCreateStaticMemberType(
590589
DIB(cx),

0 commit comments

Comments
 (0)