diff --git a/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp b/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp index 42d565959efd..da7a513315a4 100644 --- a/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp +++ b/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp @@ -79,8 +79,16 @@ static mlir::LLVM::DITypeAttr genBasicType(mlir::MLIRContext *context, context, llvm::dwarf::DW_TAG_base_type, name, bitSize, decoding); } +static mlir::StringAttr getBasicTypeName(mlir::MLIRContext *context, + llvm::StringRef baseName, + unsigned bitSize) { + std::ostringstream oss; + oss << baseName.str() << "(kind=" << (bitSize / 8) << ")"; + return mlir::StringAttr::get(context, oss.str()); +} + static mlir::LLVM::DITypeAttr genPlaceholderType(mlir::MLIRContext *context) { - return genBasicType(context, mlir::StringAttr::get(context, "integer"), + return genBasicType(context, getBasicTypeName(context, "integer", 32), /*bitSize=*/32, llvm::dwarf::DW_ATE_signed); } @@ -682,16 +690,6 @@ mlir::LLVM::DITypeAttr DebugTypeGenerator::convertPointerLikeType( /*flags=*/mlir::LLVM::DIFlags::Zero, /*extra data=*/nullptr); } -static mlir::StringAttr getBasicTypeName(mlir::MLIRContext *context, - llvm::StringRef baseName, - unsigned bitSize) { - std::ostringstream oss; - oss << baseName.str(); - if (bitSize != 32) - oss << "(kind=" << (bitSize / 8) << ")"; - return mlir::StringAttr::get(context, oss.str()); -} - mlir::LLVM::DITypeAttr DebugTypeGenerator::convertType(mlir::Type Ty, mlir::LLVM::DIFileAttr fileAttr, mlir::LLVM::DIScopeAttr scope, @@ -759,9 +757,9 @@ DebugTypeGenerator::convertType(mlir::Type Ty, mlir::LLVM::DIFileAttr fileAttr, } else if (auto vecTy = mlir::dyn_cast_if_present(Ty)) { return convertVectorType(vecTy, fileAttr, scope, declOp); } else if (mlir::isa(Ty)) { - return genBasicType(context, mlir::StringAttr::get(context, "integer"), - llvmTypeConverter.getIndexTypeBitwidth(), - llvm::dwarf::DW_ATE_signed); + unsigned bitWidth = llvmTypeConverter.getIndexTypeBitwidth(); + return genBasicType(context, getBasicTypeName(context, "integer", bitWidth), + bitWidth, llvm::dwarf::DW_ATE_signed); } else if (auto boxTy = mlir::dyn_cast_if_present(Ty)) { auto elTy = boxTy.getEleTy(); if (auto seqTy = mlir::dyn_cast_if_present(elTy)) diff --git a/flang/test/Fir/declare_value-codegen.fir b/flang/test/Fir/declare_value-codegen.fir index 4b50c6f535c1..9c82e214f30d 100644 --- a/flang/test/Fir/declare_value-codegen.fir +++ b/flang/test/Fir/declare_value-codegen.fir @@ -10,7 +10,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<>} { #di_file = #llvm.di_file<"test.f90" in ""> #di_compile_unit = #llvm.di_compile_unit, sourceLanguage = DW_LANG_Fortran95, file = #di_file, producer = "Flang", isOptimized = false, emissionKind = Full> #di_subprogram = #llvm.di_subprogram -#di_local_variable = #llvm.di_local_variable> +#di_local_variable = #llvm.di_local_variable> #loc1 = loc(fused<#di_local_variable>["test.f90":1:1]) // CHECK-LABEL: llvm.func @test_codegen diff --git a/flang/test/Integration/debug-allocatable-1.f90 b/flang/test/Integration/debug-allocatable-1.f90 index b9de3b26cdf9..c12583c6d646 100644 --- a/flang/test/Integration/debug-allocatable-1.f90 +++ b/flang/test/Integration/debug-allocatable-1.f90 @@ -21,4 +21,4 @@ end subroutine ff ! CHECK-DAG: ![[ELEM2]] = !DISubrange(count: !DIExpression(DW_OP_push_object_address, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref), lowerBound: !DIExpression(DW_OP_push_object_address, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref), stride: !DIExpression(DW_OP_push_object_address, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref)) ! CHECK-DAG: !DILocalVariable(name: "sc"{{.*}}type: ![[TY2:[0-9]+]]) ! CHECK-DAG: ![[TY2]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[TY3:[0-9]+]]{{.*}}) -! CHECK-DAG: ![[TY3]] = !DIBasicType(name: "real"{{.*}}) +! CHECK-DAG: ![[TY3]] = !DIBasicType(name: "real(kind=4)"{{.*}}) diff --git a/flang/test/Integration/debug-common-block-1.f90 b/flang/test/Integration/debug-common-block-1.f90 index 77f47daea4a9..926879a7490a 100644 --- a/flang/test/Integration/debug-common-block-1.f90 +++ b/flang/test/Integration/debug-common-block-1.f90 @@ -74,8 +74,8 @@ END ! CHECK-DAG: ![[EXPVA3:[0-9]+]] = !DIGlobalVariableExpression(var: ![[VA3]], expr: !DIExpression(DW_OP_plus_uconst, 8)) -! CHECK-DAG: ![[REAL]] = !DIBasicType(name: "real", size: 32, encoding: DW_ATE_float) -! CHECK-DAG: ![[INT]] = !DIBasicType(name: "integer", size: 32, encoding: DW_ATE_signed) +! CHECK-DAG: ![[REAL]] = !DIBasicType(name: "real(kind=4)", size: 32, encoding: DW_ATE_float) +! CHECK-DAG: ![[INT]] = !DIBasicType(name: "integer(kind=4)", size: 32, encoding: DW_ATE_signed) ! CHECK-DAG: ![[F1:[0-9]+]] = {{.*}}!DISubprogram(name: "f1"{{.*}}) ! CHECK-DAG: ![[CBF1]] = !DICommonBlock(scope: ![[F1]], declaration: null, name: "__BLNK__"{{.*}}) diff --git a/flang/test/Integration/debug-complex-1.f90 b/flang/test/Integration/debug-complex-1.f90 index 1d70140a202d..206efed2ba08 100644 --- a/flang/test/Integration/debug-complex-1.f90 +++ b/flang/test/Integration/debug-complex-1.f90 @@ -16,7 +16,7 @@ contains end function end program -! CHECK-DAG: ![[C4:.*]] = !DIBasicType(name: "complex", size: 64, encoding: DW_ATE_complex_float) +! CHECK-DAG: ![[C4:.*]] = !DIBasicType(name: "complex(kind=4)", size: 64, encoding: DW_ATE_complex_float) ! CHECK-DAG: ![[C8:.*]] = !DIBasicType(name: "complex(kind=8)", size: 128, encoding: DW_ATE_complex_float) ! CHECK-DAG: ![[C16:.*]] = !DIBasicType(name: "complex(kind=16)", size: 256, encoding: DW_ATE_complex_float) ! CHECK-DAG: !DILocalVariable(name: "c4"{{.*}}type: ![[C4]]) diff --git a/flang/test/Integration/debug-complex-2.f90 b/flang/test/Integration/debug-complex-2.f90 index c5f46d7b270b..b567eb12cacd 100644 --- a/flang/test/Integration/debug-complex-2.f90 +++ b/flang/test/Integration/debug-complex-2.f90 @@ -6,7 +6,7 @@ complex function fn(a) fn = a end function -! CHECK-DAG: ![[CMPLX:.*]] = !DIBasicType(name: "complex", size: 64, encoding: DW_ATE_complex_float) +! CHECK-DAG: ![[CMPLX:.*]] = !DIBasicType(name: "complex(kind=4)", size: 64, encoding: DW_ATE_complex_float) ! CHECK-DAG: ![[SR_TY:.*]] = !DISubroutineType(cc: DW_CC_normal, types: ![[TYPES:.*]]) ! CHECK-DAG: ![[TYPES]] = !{![[CMPLX]], ![[CMPLX]]} ! CHECK-DAG: !DISubprogram(name: "fn"{{.*}}type: ![[SR_TY]]{{.*}}) diff --git a/flang/test/Integration/debug-fixed-array-type-2.f90 b/flang/test/Integration/debug-fixed-array-type-2.f90 index 009b99af1032..b4c0b7a55563 100644 --- a/flang/test/Integration/debug-fixed-array-type-2.f90 +++ b/flang/test/Integration/debug-fixed-array-type-2.f90 @@ -21,8 +21,8 @@ contains end program -! CHECK-DAG: ![[INT:.*]] = !DIBasicType(name: "integer", size: 32, encoding: DW_ATE_signed) -! CHECK-DAG: ![[REAL:.*]] = !DIBasicType(name: "real", size: 32, encoding: DW_ATE_float) +! CHECK-DAG: ![[INT:.*]] = !DIBasicType(name: "integer(kind=4)", size: 32, encoding: DW_ATE_signed) +! CHECK-DAG: ![[REAL:.*]] = !DIBasicType(name: "real(kind=4)", size: 32, encoding: DW_ATE_float) ! CHECK-DAG: ![[R1:.*]] = !DISubrange(count: 3) ! CHECK-DAG: ![[SUB1:.*]] = !{![[R1]]} ! CHECK-DAG: ![[D1TY:.*]] = !DICompositeType(tag: DW_TAG_array_type, baseType: ![[INT]], elements: ![[SUB1]]) diff --git a/flang/test/Integration/debug-local-var-2.f90 b/flang/test/Integration/debug-local-var-2.f90 index e95263e6841a..c2bc2d9a9896 100644 --- a/flang/test/Integration/debug-local-var-2.f90 +++ b/flang/test/Integration/debug-local-var-2.f90 @@ -39,11 +39,11 @@ program mn ! BOTH-DAG: ![[MAIN:.*]] = distinct !DISubprogram(name: "MN", {{.*}}) -! BOTH-DAG: ![[TYI32:.*]] = !DIBasicType(name: "integer", size: 32, encoding: DW_ATE_signed) +! BOTH-DAG: ![[TYI32:.*]] = !DIBasicType(name: "integer(kind=4)", size: 32, encoding: DW_ATE_signed) ! BOTH-DAG: ![[TYI64:.*]] = !DIBasicType(name: "integer(kind=8)", size: 64, encoding: DW_ATE_signed) ! BOTH-DAG: ![[TYL8:.*]] = !DIBasicType(name: "logical(kind=1)", size: 8, encoding: DW_ATE_boolean) -! BOTH-DAG: ![[TYL32:.*]] = !DIBasicType(name: "logical", size: 32, encoding: DW_ATE_boolean) -! BOTH-DAG: ![[TYR32:.*]] = !DIBasicType(name: "real", size: 32, encoding: DW_ATE_float) +! BOTH-DAG: ![[TYL32:.*]] = !DIBasicType(name: "logical(kind=4)", size: 32, encoding: DW_ATE_boolean) +! BOTH-DAG: ![[TYR32:.*]] = !DIBasicType(name: "real(kind=4)", size: 32, encoding: DW_ATE_float) ! BOTH-DAG: ![[TYR64:.*]] = !DIBasicType(name: "real(kind=8)", size: 64, encoding: DW_ATE_float) ! BOTH-DAG: ![[I4]] = !DILocalVariable(name: "i4", scope: ![[MAIN]], file: !{{.*}}, line: [[@LINE+6]], type: ![[TYI32]]) diff --git a/flang/test/Integration/debug-module-2.f90 b/flang/test/Integration/debug-module-2.f90 index f07416c3ef3c..6ebae7fcb7df 100644 --- a/flang/test/Integration/debug-module-2.f90 +++ b/flang/test/Integration/debug-module-2.f90 @@ -5,8 +5,8 @@ ! CHECK-DAG: ![[FILE2:.*]] = !DIFile(filename: {{.*}}debug-module-2.f90{{.*}}) ! CHECK-DAG: ![[CU:.*]] = distinct !DICompileUnit({{.*}}file: ![[FILE]]{{.*}} globals: ![[GLOBALS:.*]]) ! CHECK-DAG: ![[MOD:.*]] = !DIModule(scope: ![[CU]], name: "helper", file: ![[FILE]]{{.*}}) -! CHECK-DAG: ![[R4:.*]] = !DIBasicType(name: "real", size: 32, encoding: DW_ATE_float) -! CHECK-DAG: ![[I4:.*]] = !DIBasicType(name: "integer", size: 32, encoding: DW_ATE_signed) +! CHECK-DAG: ![[R4:.*]] = !DIBasicType(name: "real(kind=4)", size: 32, encoding: DW_ATE_float) +! CHECK-DAG: ![[I4:.*]] = !DIBasicType(name: "integer(kind=4)", size: 32, encoding: DW_ATE_signed) module helper ! CHECK-DAG: ![[GLR:.*]] = distinct !DIGlobalVariable(name: "glr", linkageName: "_QMhelperEglr", scope: ![[MOD]], file: ![[FILE]], line: [[@LINE+2]], type: ![[R4]], isLocal: false, isDefinition: true) ! CHECK-DAG: ![[GLRX:.*]] = !DIGlobalVariableExpression(var: ![[GLR]], expr: !DIExpression()) diff --git a/flang/test/Integration/debug-proc-ptr-e2e.f90 b/flang/test/Integration/debug-proc-ptr-e2e.f90 index aa89160b7c8f..4bf0992f6adb 100644 --- a/flang/test/Integration/debug-proc-ptr-e2e.f90 +++ b/flang/test/Integration/debug-proc-ptr-e2e.f90 @@ -15,7 +15,7 @@ contains end program test_proc_ptr ! Check that fun_ptr is declared with correct type -! CHECK-DAG: ![[INT:.*]] = !DIBasicType(name: "integer", size: 32, encoding: DW_ATE_signed) +! CHECK-DAG: ![[INT:.*]] = !DIBasicType(name: "integer(kind=4)", size: 32, encoding: DW_ATE_signed) ! CHECK-DAG: ![[PTR_INT:.*]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[INT]], size: 64) ! Check that fun_ptr variable is a pointer to a subroutine type diff --git a/flang/test/Integration/debug-ptr-type.f90 b/flang/test/Integration/debug-ptr-type.f90 index 6d7178f7aca4..12dd73dc6f77 100644 --- a/flang/test/Integration/debug-ptr-type.f90 +++ b/flang/test/Integration/debug-ptr-type.f90 @@ -37,7 +37,7 @@ subroutine ff(n, m) end subroutine ff -! CHECK-DAG: ![[INT_TY:[0-9]+]] = !DIBasicType(name: "integer"{{.*}}) +! CHECK-DAG: ![[INT_TY:[0-9]+]] = !DIBasicType(name: "integer(kind=4)"{{.*}}) ! CHECK-DAG: ![[ELEMS1:[0-9]+]] = !{!{{[0-9]+}}} ! CHECK-DAG: !DILocalVariable(name: "par"{{.*}}type: ![[ARR_TY1:[0-9]+]]) ! CHECK-DAG: ![[ARR_TY1]] = !DICompositeType(tag: DW_TAG_array_type{{.*}}elements: ![[ELEMS2:[0-9]+]], dataLocation: !DIExpression(DW_OP_push_object_address, DW_OP_deref), associated: !DIExpression(DW_OP_push_object_address, DW_OP_deref, DW_OP_lit0, DW_OP_ne)) diff --git a/flang/test/Transforms/debug-allocatable-1.fir b/flang/test/Transforms/debug-allocatable-1.fir index e02df428160f..bbe60f02e635 100644 --- a/flang/test/Transforms/debug-allocatable-1.fir +++ b/flang/test/Transforms/debug-allocatable-1.fir @@ -18,7 +18,7 @@ module { #loc2 = loc("test.f90":4:3) #loc3 = loc("test.f90":1:3) -// CHECK-DAG: #[[TY1:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[TY1:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[TY2:.*]] = #llvm.di_composite_type{{.*}}elements = #llvm.di_subrange{{.*}}#llvm.di_subrange // CHECK-DAG: #[[TY3:.*]] = #llvm.di_derived_type diff --git a/flang/test/Transforms/debug-associate-component.fir b/flang/test/Transforms/debug-associate-component.fir index 8fcd99d81fdd..fdb385b3d128 100644 --- a/flang/test/Transforms/debug-associate-component.fir +++ b/flang/test/Transforms/debug-associate-component.fir @@ -12,7 +12,7 @@ // end associate // end subroutine test -// CHECK: #[[TYPE:.*]] = #llvm.di_basic_type +// CHECK: #[[TYPE:.*]] = #llvm.di_basic_type // CHECK: #[[VAR:.*]] = #llvm.di_local_variable module attributes {dlti.dl_spec = #dlti.dl_spec : vector<2xi64>, f16 = dense<16> : vector<2xi64>, i32 = dense<32> : vector<2xi64>, f128 = dense<128> : vector<2xi64>, !llvm.ptr<270> = dense<32> : vector<4xi64>, f64 = dense<64> : vector<2xi64>, !llvm.ptr<271> = dense<32> : vector<4xi64>, !llvm.ptr<272> = dense<64> : vector<4xi64>, i128 = dense<128> : vector<2xi64>, i64 = dense<64> : vector<2xi64>, f80 = dense<128> : vector<2xi64>, !llvm.ptr = dense<64> : vector<4xi64>, i8 = dense<8> : vector<2xi64>, i1 = dense<8> : vector<2xi64>, "dlti.endianness" = "little", "dlti.stack_alignment" = 128 : i64>, fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", fir.target_cpu = "x86-64", llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", llvm.ident = "flang version 21.0.0 (https://github.com/llvm/llvm-project.git b7b1e2b9ad905f2b984d760eeea4397c1c0adff4)", llvm.target_triple = "x86_64-unknown-linux-gnu"} { diff --git a/flang/test/Transforms/debug-complex-1.fir b/flang/test/Transforms/debug-complex-1.fir index 6e2c6c5bdb35..95754ff33466 100644 --- a/flang/test/Transforms/debug-complex-1.fir +++ b/flang/test/Transforms/debug-complex-1.fir @@ -27,7 +27,7 @@ module { #loc4 = loc("./simple.f90":11:1) // CHECK-DAG: #[[CMPX8:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[CMPX4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[CMPX4:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[CMPX16:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[TY1:.*]] = #llvm.di_subroutine_type<{{.*}}types = #[[CMPX8]], #[[CMPX4]]> diff --git a/flang/test/Transforms/debug-derived-type-1.fir b/flang/test/Transforms/debug-derived-type-1.fir index 22832b67742c..0440e7dd2109 100644 --- a/flang/test/Transforms/debug-derived-type-1.fir +++ b/flang/test/Transforms/debug-derived-type-1.fir @@ -44,10 +44,10 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry, d #loc12 = loc("derived1.f90":105:3) -// CHECK-DAG: #[[INT_TY:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[INT_TY:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[INT8_TY:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[REAL4_TY:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[CMX8_TY:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[REAL4_TY:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[CMX8_TY:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[CMX_ARR:.*]] = #llvm.di_composite_type // CHECK-DAG: #[[LOG_TY:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[REAL8_TY:.*]] = #llvm.di_basic_type diff --git a/flang/test/Transforms/debug-fixed-array-type.fir b/flang/test/Transforms/debug-fixed-array-type.fir index 75cb88b08b24..55b03183a60f 100644 --- a/flang/test/Transforms/debug-fixed-array-type.fir +++ b/flang/test/Transforms/debug-fixed-array-type.fir @@ -29,8 +29,8 @@ module { #loc5 = loc("test.f90":8:11) -// CHECK-DAG: #[[INT:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[REAL:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[INT:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[REAL:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[D1TY:.*]] = #llvm.di_composite_type> // CHECK-DAG: #[[D2TY:.*]] = #llvm.di_composite_type, #llvm.di_subrange> // CHECK-DAG: #[[D3TY:.*]] = #llvm.di_composite_type, #llvm.di_subrange, #llvm.di_subrange> diff --git a/flang/test/Transforms/debug-fn-info.fir b/flang/test/Transforms/debug-fn-info.fir index e42beb1f748f..96f366aa421c 100644 --- a/flang/test/Transforms/debug-fn-info.fir +++ b/flang/test/Transforms/debug-fn-info.fir @@ -65,11 +65,11 @@ module { // CHECK-DAG: #[[INT8:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[INT4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[INT4:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[REAL8:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[LOG1:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[REAL4:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[LOG4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[REAL4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[LOG4:.*]] = #llvm.di_basic_type // CHECK: #[[TY0:.*]] = #llvm.di_subroutine_type // CHECK: #[[TY1:.*]] = #llvm.di_subroutine_type // CHECK: #[[TY2:.*]] = #llvm.di_subroutine_type diff --git a/flang/test/Transforms/debug-index-type.fir b/flang/test/Transforms/debug-index-type.fir index 751e2e156dc2..b6164f18c925 100644 --- a/flang/test/Transforms/debug-index-type.fir +++ b/flang/test/Transforms/debug-index-type.fir @@ -5,6 +5,6 @@ module { } #loc1 = loc("test.f90":5:1) -// CHECK: #[[INT32_TY:.*]] = #llvm.di_basic_type -// CHECK: #[[INT64_TY:.*]] = #llvm.di_basic_type +// CHECK: #[[INT32_TY:.*]] = #llvm.di_basic_type +// CHECK: #[[INT64_TY:.*]] = #llvm.di_basic_type // CHECK: #llvm.di_subroutine_type<{{.*}}types = #[[INT32_TY]], #[[INT64_TY]]> diff --git a/flang/test/Transforms/debug-local-var.fir b/flang/test/Transforms/debug-local-var.fir index 863d86cb0594..5fa799fe65fa 100644 --- a/flang/test/Transforms/debug-local-var.fir +++ b/flang/test/Transforms/debug-local-var.fir @@ -72,11 +72,11 @@ module { #loc16 = loc("test.f90":22:5) // CHECK-DAG: #[[INT8:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[INT4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[INT4:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[REAL8:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[LOG1:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[REAL4:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[LOG4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[REAL4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[LOG4:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[MAIN:.*]] = #llvm.di_subprogram<{{.*}}name = "mn"{{.*}}> // CHECK-DAG: #[[FN1:.*]] = #llvm.di_subprogram<{{.*}}name = "fn1"{{.*}}> // CHECK-DAG: #[[FN2:.*]] = #llvm.di_subprogram<{{.*}}name = "fn2"{{.*}}> diff --git a/flang/test/Transforms/debug-module-1.fir b/flang/test/Transforms/debug-module-1.fir index c1e4c2eeffef..18f4892d6063 100644 --- a/flang/test/Transforms/debug-module-1.fir +++ b/flang/test/Transforms/debug-module-1.fir @@ -24,8 +24,8 @@ module { #loc2 = loc("test.f90":15:8) #loc3 = loc("test.f90":20:5) -// CHECK-DAG: #[[I4:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[R4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[I4:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[R4:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[CU:.*]] = #llvm.di_compile_unit<{{.*}}> // CHECK-DAG: #[[MOD:.*]] = #llvm.di_module<{{.*}}scope = #[[CU]], name = "helper"{{.*}}> // CHECK-DAG: #[[LOC1:.*]] = loc("{{.*}}test.f90":12{{.*}}) diff --git a/flang/test/Transforms/debug-module-2.fir b/flang/test/Transforms/debug-module-2.fir index 32a25e303751..a71b8d43f3b9 100644 --- a/flang/test/Transforms/debug-module-2.fir +++ b/flang/test/Transforms/debug-module-2.fir @@ -10,8 +10,8 @@ module { fir.has_value %0 : f32 } loc(#loc4) } -#di_basic_type = #llvm.di_basic_type -#di_basic_type1 = #llvm.di_basic_type +#di_basic_type = #llvm.di_basic_type +#di_basic_type1 = #llvm.di_basic_type #di_file = #llvm.di_file<"test.f90" in ""> #di_subroutine_type = #llvm.di_subroutine_type diff --git a/flang/test/Transforms/debug-proc-ptr.fir b/flang/test/Transforms/debug-proc-ptr.fir index 296355778690..b63c383394fb 100644 --- a/flang/test/Transforms/debug-proc-ptr.fir +++ b/flang/test/Transforms/debug-proc-ptr.fir @@ -21,8 +21,8 @@ module { #loc2 = loc("test.f90":3:30) #loc3 = loc("test.f90":4:30) -// CHECK-DAG: #[[INT:.*]] = #llvm.di_basic_type -// CHECK-DAG: #[[REAL32:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[INT:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[REAL32:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[REAL:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[PTR_INT:.*]] = #llvm.di_derived_type diff --git a/flang/test/Transforms/debug-ptr-type.fir b/flang/test/Transforms/debug-ptr-type.fir index 91364836b2d0..148bbb410032 100644 --- a/flang/test/Transforms/debug-ptr-type.fir +++ b/flang/test/Transforms/debug-ptr-type.fir @@ -31,7 +31,7 @@ module { #loc3 = loc("test.f90":7:1) #loc4 = loc("test.f90":8:1) -// CHECK-DAG: #[[INT_TY:.*]] = #llvm.di_basic_type +// CHECK-DAG: #[[INT_TY:.*]] = #llvm.di_basic_type // CHECK-DAG: #[[ARR1_TY:.*]] = #llvm.di_composite_type, elements = #llvm.di_subrange, lowerBound = #llvm.di_expression<{{.*}}>, #llvm.di_subrange, lowerBound = #llvm.di_expression<{{.*}}>>> // CHECK-DAG: #[[ARR2_TY:.*]] = #llvm.di_composite_type, elements = #llvm.di_subrange, lowerBound = #llvm.di_expression<{{.*}}>>> diff --git a/flang/test/Transforms/debug-vector-type.fir b/flang/test/Transforms/debug-vector-type.fir index 9e41d90f407b..1ae2e88f2dbf 100644 --- a/flang/test/Transforms/debug-vector-type.fir +++ b/flang/test/Transforms/debug-vector-type.fir @@ -6,16 +6,16 @@ func.func private @foo1(%arg0: !fir.vector<20:bf16>) // CHECK-DAG: #llvm.di_composite_type> func.func private @foo2(%arg0: !fir.vector<30:f32>) -// CHECK-DAG: #[[F32:.*]] = #llvm.di_basic_type -// CHECK-DAG: #llvm.di_composite_type> +// CHECK-DAG: #[[F32:.*]] = #llvm.di_basic_type +// CHECK-DAG: #llvm.di_composite_type> func.func private @foo3(%arg0: !fir.vector<10:f64>) // CHECK-DAG: #[[F64:.*]] = #llvm.di_basic_type // CHECK-DAG: #llvm.di_composite_type> func.func private @foo4(%arg0: !fir.vector<5:i32>) -// CHECK-DAG: #[[I32:.*]] = #llvm.di_basic_type -// CHECK-DAG: #llvm.di_composite_type> +// CHECK-DAG: #[[I32:.*]] = #llvm.di_basic_type +// CHECK-DAG: #llvm.di_composite_type> func.func private @foo5(%arg0: !fir.vector<2:i64>) // CHECK-DAG: #[[I64:.*]] = #llvm.di_basic_type