llvm-toolchain/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch
Sylvestre Ledru 9e36f19118 * New snapshot release
* Merge changes from the 3.3 branch (see 1:3.3-10)
* Install libclang.so in /usr/lib/*/libclang-3.3.so
* Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
* Also ship the python clang binding (python-clang-3.3)
  (LLVM no longer mean Low Level Virtual Machine)
* Disable the build of lldb under HURD
* Ship the lldb headers into lldb-X.Y-dev (Closes: #723743)
  I might create a liblldb-X.Y library at some point but I think it is too
  early.
* Fix "cannot compile this atomic library call"
  Thanks to Francisco Facioni for the refresh (Closes: #705115)
* Install libclang.so in /usr/lib/*/libclang-3.3.so
* Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
* Also ship the python clang binding (python-clang-3.3)
* Fix a FTBFS with a duplicate declaration of shouldUseInlineAtomic
* Update the build dependency from tcl8.5 to tcl (Closes: #725953)
2013-10-10 11:40:12 +00:00

54 lines
2.5 KiB
Diff

From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Fri, 29 Jun 2012 12:58:34 -0700
Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue
lines in a function."
This meants that the debugger could find meaningful line information.
This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
---
lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++-----
test/DebugInfo/X86/ending-run.ll | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
Index: llvm-toolchain-snapshot_3.4~svn192346/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn192346.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-10 13:38:17.174082789 +0200
+++ llvm-toolchain-snapshot_3.4~svn192346/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-10 13:38:17.166082790 +0200
@@ -1478,15 +1478,12 @@
if (!MI->isDebugValue()) {
DebugLoc DL = MI->getDebugLoc();
if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
- unsigned Flags = 0;
+ unsigned Flags = DWARF2_FLAG_IS_STMT;
PrevInstLoc = DL;
if (DL == PrologEndLoc) {
Flags |= DWARF2_FLAG_PROLOGUE_END;
PrologEndLoc = DebugLoc();
}
- if (PrologEndLoc.isUnknown())
- Flags |= DWARF2_FLAG_IS_STMT;
-
if (!DL.isUnknown()) {
const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
Index: llvm-toolchain-snapshot_3.4~svn192346/test/DebugInfo/X86/ending-run.ll
===================================================================
--- llvm-toolchain-snapshot_3.4~svn192346.orig/test/DebugInfo/X86/ending-run.ll 2013-10-10 13:38:17.174082789 +0200
+++ llvm-toolchain-snapshot_3.4~svn192346/test/DebugInfo/X86/ending-run.ll 2013-10-10 13:38:17.166082790 +0200
@@ -1,11 +1,9 @@
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s
-; Check that the line table starts at 7, not 4, but that the first
-; statement isn't until line 8.
+; Check that the line table starts at 7, not 4.
-; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt
-; CHECK: 0x0000000000000000 7 0 1 0
+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt
; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end
define i32 @callee(i32 %x) nounwind uwtable ssp {