[llvm] r312758 - Revert r312318, r312325, r312424, r312489
Richard Trieu via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 7 16:20:36 PDT 2017
Author: rtrieu
Date: Thu Sep 7 16:20:35 2017
New Revision: 312758
URL: http://llvm.org/viewvc/llvm-project?rev=312758&view=rev
Log:
Revert r312318, r312325, r312424, r312489
r312318 - Debug info for variables whose type is shrinked to bool
r312325, r312424, r312489 - Test case for r312318
Revision 312318 introduced a null dereference bug.
Details in https://bugs.llvm.org/show_bug.cgi?id=34490
Removed:
llvm/trunk/test/Transforms/GlobalOpt/integer-bool-dwarf.ll
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
llvm/trunk/lib/IR/DebugInfoMetadata.cpp
llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp?rev=312758&r1=312757&r2=312758&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp Thu Sep 7 16:20:35 2017
@@ -338,7 +338,6 @@ void DwarfExpression::addExpression(DIEx
break;
case dwarf::DW_OP_plus:
case dwarf::DW_OP_minus:
- case dwarf::DW_OP_mul:
emitOp(Op->getOp());
break;
case dwarf::DW_OP_deref:
Modified: llvm/trunk/lib/IR/DebugInfoMetadata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfoMetadata.cpp?rev=312758&r1=312757&r2=312758&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DebugInfoMetadata.cpp (original)
+++ llvm/trunk/lib/IR/DebugInfoMetadata.cpp Thu Sep 7 16:20:35 2017
@@ -643,7 +643,6 @@ bool DIExpression::isValid() const {
case dwarf::DW_OP_plus_uconst:
case dwarf::DW_OP_plus:
case dwarf::DW_OP_minus:
- case dwarf::DW_OP_mul:
case dwarf::DW_OP_deref:
case dwarf::DW_OP_xderef:
break;
Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=312758&r1=312757&r2=312758&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Thu Sep 7 16:20:35 2017
@@ -36,7 +36,6 @@
#include "llvm/IR/Module.h"
#include "llvm/IR/Operator.h"
#include "llvm/IR/ValueHandle.h"
-#include "llvm/IR/DebugInfoMetadata.h"
#include "llvm/Pass.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
@@ -1604,47 +1603,12 @@ static bool TryToShrinkGlobalToBoolean(G
assert(InitVal->getType() != Type::getInt1Ty(GV->getContext()) &&
"No reason to shrink to bool!");
- SmallVector<DIGlobalVariableExpression *, 1> GVs;
- GV->getDebugInfo(GVs);
-
// If initialized to zero and storing one into the global, we can use a cast
// instead of a select to synthesize the desired value.
bool IsOneZero = false;
- if (ConstantInt *CI = dyn_cast<ConstantInt>(OtherVal)){
+ if (ConstantInt *CI = dyn_cast<ConstantInt>(OtherVal))
IsOneZero = InitVal->isNullValue() && CI->isOne();
- ConstantInt *CIInit = dyn_cast<ConstantInt>(GV->getInitializer());
- uint64_t ValInit = CIInit->getZExtValue();
- uint64_t ValOther = CI->getZExtValue();
- uint64_t ValMinus = ValOther - ValInit;
-
- for(auto *GVe : GVs){
- DIGlobalVariable *DGV = GVe->getVariable();
- DIExpression *E = GVe->getExpression();
-
- // val * (ValOther - ValInit) + ValInit:
- // DW_OP_deref DW_OP_constu <ValMinus>
- // DW_OP_mul DW_OP_constu <ValInit> DW_OP_plus DW_OP_stack_value
- E = DIExpression::get(NewGV->getContext(),
- {dwarf::DW_OP_deref,
- dwarf::DW_OP_constu,
- ValMinus,
- dwarf::DW_OP_mul,
- dwarf::DW_OP_constu,
- ValInit,
- dwarf::DW_OP_plus,
- dwarf::DW_OP_stack_value});
- DIGlobalVariableExpression *DGVE =
- DIGlobalVariableExpression::get(NewGV->getContext(), DGV, E);
- NewGV->addDebugInfo(DGVE);
- }
- } else {
- // FIXME: This will only emit address for debugger on which will
- // be written only 0 or 1.
- for(auto *GV : GVs)
- NewGV->addDebugInfo(GV);
- }
-
while (!GV->use_empty()) {
Instruction *UI = cast<Instruction>(GV->user_back());
if (StoreInst *SI = dyn_cast<StoreInst>(UI)) {
Removed: llvm/trunk/test/Transforms/GlobalOpt/integer-bool-dwarf.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/integer-bool-dwarf.ll?rev=312757&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/integer-bool-dwarf.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/integer-bool-dwarf.ll (removed)
@@ -1,57 +0,0 @@
-;RUN: opt -S -globalopt -f %s | FileCheck %s
-
-;CHECK: !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression(DW_OP_deref, DW_OP_constu, 111, DW_OP_mul, DW_OP_constu, 0, DW_OP_plus, DW_OP_stack_value))
-
- at foo = internal global i32 0, align 4, !dbg !0
-
-; Function Attrs: noinline nounwind optnone uwtable
-define void @set1() #0 !dbg !11 {
-entry:
- store i32 111, i32* @foo, align 4, !dbg !14
- ret void, !dbg !15
-}
-
-; Function Attrs: noinline nounwind optnone uwtable
-define void @set2() #0 !dbg !16 {
-entry:
- store i32 0, i32* @foo, align 4, !dbg !17
- ret void, !dbg !18
-}
-
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @get() #0 !dbg !19 {
-entry:
- %0 = load i32, i32* @foo, align 4, !dbg !22
- ret i32 %0, !dbg !23
-}
-
-attributes #0 = { noinline nounwind optnone uwtable }
-
-!llvm.dbg.cu = !{!2}
-!llvm.module.flags = !{!7, !8, !9}
-!llvm.ident = !{!10}
-
-!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
-!1 = distinct !DIGlobalVariable(name: "foo", scope: !2, file: !3, line: 1, type: !6, isLocal: true, isDefinition: true)
-!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 6.0.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5)
-!3 = !DIFile(filename: "integer-bool-dwarf.c", directory: "/")
-!4 = !{}
-!5 = !{!0}
-!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!7 = !{i32 2, !"Dwarf Version", i32 4}
-!8 = !{i32 2, !"Debug Info Version", i32 3}
-!9 = !{i32 1, !"wchar_size", i32 4}
-!10 = !{!"clang version 6.0.0 "}
-!11 = distinct !DISubprogram(name: "set1", scope: !3, file: !3, line: 3, type: !12, isLocal: false, isDefinition: true, scopeLine: 4, isOptimized: false, unit: !2, variables: !4)
-!12 = !DISubroutineType(types: !13)
-!13 = !{null}
-!14 = !DILocation(line: 5, column: 7, scope: !11)
-!15 = !DILocation(line: 6, column: 1, scope: !11)
-!16 = distinct !DISubprogram(name: "set2", scope: !3, file: !3, line: 8, type: !12, isLocal: false, isDefinition: true, scopeLine: 9, isOptimized: false, unit: !2, variables: !4)
-!17 = !DILocation(line: 10, column: 7, scope: !16)
-!18 = !DILocation(line: 11, column: 1, scope: !16)
-!19 = distinct !DISubprogram(name: "get", scope: !3, file: !3, line: 13, type: !20, isLocal: false, isDefinition: true, scopeLine: 14, isOptimized: false, unit: !2, variables: !4)
-!20 = !DISubroutineType(types: !21)
-!21 = !{!6}
-!22 = !DILocation(line: 15, column: 10, scope: !19)
-!23 = !DILocation(line: 15, column: 3, scope: !19)
More information about the llvm-commits
mailing list