[llvm-branch-commits] [llvm-branch] r84018 - in /llvm/branches/Apple/Leela: include/llvm/ADT/HashExtras.h lib/CodeGen/AsmPrinter/DwarfDebug.cpp test/FrontendC++/2003-11-09-ConstructorTypeSafety.cpp test/FrontendC++/2003-11-18-MemberInitializationCasting.cpp test/FrontendC++/2006-11-06-StackTrace.cpp test/FrontendC/2005-12-04-DeclarationLineNumbers.c test/FrontendC/2006-01-13-Includes.c test/FrontendC/2009-02-17-BitField-dbg.c test/FrontendObjC/2009-08-17-DebugInfo.m test/Scripts/notcast
Bill Wendling
isanbard at gmail.com
Tue Oct 13 13:33:07 PDT 2009
Author: void
Date: Tue Oct 13 15:33:06 2009
New Revision: 84018
URL: http://llvm.org/viewvc/llvm-project?rev=84018&view=rev
Log:
$ svn merge -c 83933 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83933 into '.':
U test/FrontendC++/2006-11-06-StackTrace.cpp
U test/FrontendObjC/2009-08-17-DebugInfo.m
U test/FrontendC/2005-12-04-DeclarationLineNumbers.c
U test/FrontendC/2006-01-13-Includes.c
U test/FrontendC/2009-02-17-BitField-dbg.c
$ svn merge -c 83937 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83937 into '.':
D test/FrontendC++/2003-11-09-ConstructorTypeSafety.cpp
D test/FrontendC++/2003-11-18-MemberInitializationCasting.cpp
$ svn merge -c 83938 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83938 into '.':
D test/Scripts/notcast
$ svn merge -c 83943 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83943 into '.':
D include/llvm/ADT/HashExtras.h
$ svn merge -c 83950 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83950 into '.':
U lib/CodeGen/AsmPrinter/DwarfDebug.cpp
$ svn merge -c 83975 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83975 into '.':
G test/FrontendObjC/2009-08-17-DebugInfo.m
Removed:
llvm/branches/Apple/Leela/include/llvm/ADT/HashExtras.h
llvm/branches/Apple/Leela/test/FrontendC++/2003-11-09-ConstructorTypeSafety.cpp
llvm/branches/Apple/Leela/test/FrontendC++/2003-11-18-MemberInitializationCasting.cpp
llvm/branches/Apple/Leela/test/Scripts/notcast
Modified:
llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/branches/Apple/Leela/test/FrontendC++/2006-11-06-StackTrace.cpp
llvm/branches/Apple/Leela/test/FrontendC/2005-12-04-DeclarationLineNumbers.c
llvm/branches/Apple/Leela/test/FrontendC/2006-01-13-Includes.c
llvm/branches/Apple/Leela/test/FrontendC/2009-02-17-BitField-dbg.c
llvm/branches/Apple/Leela/test/FrontendObjC/2009-08-17-DebugInfo.m
Removed: llvm/branches/Apple/Leela/include/llvm/ADT/HashExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/ADT/HashExtras.h?rev=84017&view=auto
==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/ADT/HashExtras.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/ADT/HashExtras.h (removed)
@@ -1,40 +0,0 @@
-//===-- llvm/ADT/HashExtras.h - Useful functions for STL hash ---*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains some templates that are useful if you are working with the
-// STL Hashed containers.
-//
-// No library is required when using these functions.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ADT_HASHEXTRAS_H
-#define LLVM_ADT_HASHEXTRAS_H
-
-#include <string>
-
-// Cannot specialize hash template from outside of the std namespace.
-namespace HASH_NAMESPACE {
-
-// Provide a hash function for arbitrary pointers...
-template <class T> struct hash<T *> {
- inline size_t operator()(const T *Val) const {
- return reinterpret_cast<size_t>(Val);
- }
-};
-
-template <> struct hash<std::string> {
- size_t operator()(std::string const &str) const {
- return hash<char const *>()(str.c_str());
- }
-};
-
-} // End namespace std
-
-#endif
Modified: llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=84018&r1=84017&r2=84018&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Oct 13 15:33:06 2009
@@ -23,9 +23,10 @@
#include "llvm/Target/TargetLoweringObjectFile.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/Timer.h"
-#include "llvm/Support/Debug.h"
#include "llvm/System/Path.h"
using namespace llvm;
@@ -1909,7 +1910,7 @@
if (D.isLexicalBlock())
return getDISubprogram(DILexicalBlock(N).getContext().getNode());
- assert (0 && "Unexpected Descriptor!");
+ llvm_unreachable("Unexpected Descriptor!");
}
/// BeginFunction - Gather pre-function debug information. Assumes being
Removed: llvm/branches/Apple/Leela/test/FrontendC++/2003-11-09-ConstructorTypeSafety.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendC%2B%2B/2003-11-09-ConstructorTypeSafety.cpp?rev=84017&view=auto
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendC++/2003-11-09-ConstructorTypeSafety.cpp (original)
+++ llvm/branches/Apple/Leela/test/FrontendC++/2003-11-09-ConstructorTypeSafety.cpp (removed)
@@ -1,21 +0,0 @@
-// The code generated for this testcase should be completely typesafe!
-// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | \
-// RUN: notcast
-
-struct contained {
- unsigned X;
- contained();
-};
-
-struct base {
- unsigned A, B;
-};
-
-struct derived : public base {
- contained _M_value_field;
-};
-
-int test() {
- derived X;
-}
-
Removed: llvm/branches/Apple/Leela/test/FrontendC++/2003-11-18-MemberInitializationCasting.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendC%2B%2B/2003-11-18-MemberInitializationCasting.cpp?rev=84017&view=auto
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendC++/2003-11-18-MemberInitializationCasting.cpp (original)
+++ llvm/branches/Apple/Leela/test/FrontendC++/2003-11-18-MemberInitializationCasting.cpp (removed)
@@ -1,13 +0,0 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | notcast
-
-struct A {
- A() : i(0) {}
- int getI() {return i;}
- int i;
-};
-
-int f(int j)
-{
- A a;
- return j+a.getI();
-}
Modified: llvm/branches/Apple/Leela/test/FrontendC++/2006-11-06-StackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=84018&r1=84017&r2=84018&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
+++ llvm/branches/Apple/Leela/test/FrontendC++/2006-11-06-StackTrace.cpp Tue Oct 13 15:33:06 2009
@@ -13,6 +13,7 @@
// Only works on ppc (but not apple-darwin9), x86 and x86_64. Should
// generalize?
// XFAIL: alpha|arm|powerpc-apple-darwin9
+// XFAIL: *
#include <stdlib.h>
Modified: llvm/branches/Apple/Leela/test/FrontendC/2005-12-04-DeclarationLineNumbers.c
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendC/2005-12-04-DeclarationLineNumbers.c?rev=84018&r1=84017&r2=84018&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendC/2005-12-04-DeclarationLineNumbers.c (original)
+++ llvm/branches/Apple/Leela/test/FrontendC/2005-12-04-DeclarationLineNumbers.c Tue Oct 13 15:33:06 2009
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -g -o - | grep {llvm.dbg.stoppoint.*i32 14}
+// RUN: %llvmgcc %s -S -g -o - | grep DW_TAG_compile_unit | count 1
// PR664: ensure that line #'s are emitted for declarations
Modified: llvm/branches/Apple/Leela/test/FrontendC/2006-01-13-Includes.c
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendC/2006-01-13-Includes.c?rev=84018&r1=84017&r2=84018&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendC/2006-01-13-Includes.c (original)
+++ llvm/branches/Apple/Leela/test/FrontendC/2006-01-13-Includes.c Tue Oct 13 15:33:06 2009
@@ -1,6 +1,7 @@
// RUN: %llvmgcc %s -g -S -o - | llvm-as | opt -std-compile-opts | \
// RUN: llvm-dis | grep {test/FrontendC}
// PR676
+// XFAIL: *
#include <stdio.h>
Modified: llvm/branches/Apple/Leela/test/FrontendC/2009-02-17-BitField-dbg.c
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendC/2009-02-17-BitField-dbg.c?rev=84018&r1=84017&r2=84018&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendC/2009-02-17-BitField-dbg.c (original)
+++ llvm/branches/Apple/Leela/test/FrontendC/2009-02-17-BitField-dbg.c Tue Oct 13 15:33:06 2009
@@ -5,6 +5,7 @@
// RUN: echo {ptype mystruct} > %t2
// RUN: gdb -q -batch -n -x %t2 2009-02-17-BitField-dbg.o | \
// RUN: tee 2009-02-17-BitField-dbg.out | grep "int a : 4"
+// XFAIL: *
struct {
int a:4;
Modified: llvm/branches/Apple/Leela/test/FrontendObjC/2009-08-17-DebugInfo.m
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/FrontendObjC/2009-08-17-DebugInfo.m?rev=84018&r1=84017&r2=84018&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/test/FrontendObjC/2009-08-17-DebugInfo.m (original)
+++ llvm/branches/Apple/Leela/test/FrontendObjC/2009-08-17-DebugInfo.m Tue Oct 13 15:33:06 2009
@@ -6,7 +6,7 @@
// RUN: echo {break randomFunc\n} > %t.in
// RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | \
// RUN: grep {Breakpoint 1 at 0x.*: file 2009-08-17-DebugInfo.m, line 21}
-// XTARGET: darwin
+// XFAIL: *
@interface MyClass
{
int my;
Removed: llvm/branches/Apple/Leela/test/Scripts/notcast
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/Scripts/notcast?rev=84017&view=auto
==============================================================================
--- llvm/branches/Apple/Leela/test/Scripts/notcast (original)
+++ llvm/branches/Apple/Leela/test/Scripts/notcast (removed)
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Program: notcast
-#
-# Synopsis: Returns 0 if the input does not contain a cast operator
-#
-# Syntax: notcast tailexpr
-#
-# postpat - optionally allows a regular expression to go at the end
-# prepat - optionally allow a regular expression to go at the start
-#
-
-if grep "$2"'\(\([sz]ext\)\|\(trunc\)\|\(fpto[us]i\)\|\([us]itofp\)\|\(bitcast\)\|\(fpext\)\|\(fptrunc\)\|\(ptrtoint\)\|\(inttoptr\)\|\(cast\)\)'"$1"
-then exit 1
-else exit 0
-fi
More information about the llvm-branch-commits
mailing list