diff --git a/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll b/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll
index 3b4fb14c7d46..b15145d85f17 100644
--- a/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll
+++ b/llvm/test/CodeGen/ARM/2010-08-04-StackVariable.ll
@@ -1,134 +1,73 @@
-; RUN: llc -mtriple arm-apple-darwin -O0 -filetype asm -o - %s | FileCheck %s
+; RUN: llc -mtriple=arm-apple-darwin -O0 -o - %s | FileCheck %s
 ; Use DW_OP_breg in variable's location expression if the variable is in a stack slot.
 
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:64:64-v128:128:128-a0:0:64"
-target triple = "arm-apple-darwin"
-
-%struct.SVal = type { i8*, i32 }
-
-define i32 @_Z3fooi4SVal(i32 %i, %struct.SVal* noalias %location) nounwind ssp !dbg !17 {
-entry:
-  %"alloca point" = bitcast i32 0 to i32
-  call void @llvm.dbg.value(metadata i32 %i, metadata !23, metadata !DIExpression()), !dbg !24
-  call void @llvm.dbg.value(metadata %struct.SVal* %location, metadata !25, metadata !DIExpression()), !dbg !24
-  %0 = icmp ne i32 %i, 0, !dbg !27
-  br i1 %0, label %bb, label %bb1, !dbg !27
-
-bb:
-  %1 = getelementptr inbounds %struct.SVal, %struct.SVal* %location, i32 0, i32 1, !dbg !29
-  %2 = load i32, i32* %1, align 8, !dbg !29
-  %3 = add i32 %2, %i, !dbg !29
-  br label %bb2, !dbg !29
-
-bb1:
-  %4 = getelementptr inbounds %struct.SVal, %struct.SVal* %location, i32 0, i32 1, !dbg !30
-  %5 = load i32, i32* %4, align 8, !dbg !30
-  %6 = sub i32 %5, 1, !dbg !30
-  br label %bb2, !dbg !30
-
-bb2:
-  %.0 = phi i32 [ %3, %bb ], [ %6, %bb1 ]
-  br label %return, !dbg !29
-
-return:
-  ret i32 %.0, !dbg !29
-}
-
-define linkonce_odr void @_ZN4SValC1Ev(%struct.SVal* %this) nounwind ssp align 2  !dbg !16 {
-entry:
-  %"alloca point" = bitcast i32 0 to i32
-  call void @llvm.dbg.value(metadata %struct.SVal* %this, metadata !31, metadata !DIExpression()), !dbg !34
-  %0 = getelementptr inbounds %struct.SVal, %struct.SVal* %this, i32 0, i32 0, !dbg !34
-  store i8* null, i8** %0, align 8, !dbg !34
-  %1 = getelementptr inbounds %struct.SVal, %struct.SVal* %this, i32 0, i32 1, !dbg !34
-  store i32 0, i32* %1, align 8, !dbg !34
-  br label %return, !dbg !34
-
-return:
-  ret void, !dbg !35
-}
-
-declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
-
-define i32 @main() nounwind ssp !dbg !20 {
-entry:
-  %0 = alloca %struct.SVal
-  %v = alloca %struct.SVal
-  %"alloca point" = bitcast i32 0 to i32
-  call void @llvm.dbg.declare(metadata %struct.SVal* %v, metadata !38, metadata !DIExpression()), !dbg !41
-  call void @_ZN4SValC1Ev(%struct.SVal* %v) nounwind, !dbg !41
-  %1 = getelementptr inbounds %struct.SVal, %struct.SVal* %v, i32 0, i32 1, !dbg !42
-  store i32 1, i32* %1, align 8, !dbg !42
-  %2 = getelementptr inbounds %struct.SVal, %struct.SVal* %0, i32 0, i32 0, !dbg !43
-  %3 = getelementptr inbounds %struct.SVal, %struct.SVal* %v, i32 0, i32 0, !dbg !43
-  %4 = load i8*, i8** %3, align 8, !dbg !43
-  store i8* %4, i8** %2, align 8, !dbg !43
-  %5 = getelementptr inbounds %struct.SVal, %struct.SVal* %0, i32 0, i32 1, !dbg !43
-  %6 = getelementptr inbounds %struct.SVal, %struct.SVal* %v, i32 0, i32 1, !dbg !43
-  %7 = load i32, i32* %6, align 8, !dbg !43
-  store i32 %7, i32* %5, align 8, !dbg !43
-  %8 = call i32 @_Z3fooi4SVal(i32 2, %struct.SVal* noalias %0) nounwind, !dbg !43
-  call void @llvm.dbg.value(metadata i32 %8, metadata !44, metadata !DIExpression()), !dbg !43
-  br label %return, !dbg !45
-
-return:
-  ret i32 0, !dbg !45
-}
-
-declare void @llvm.dbg.value(metadata, metadata, metadata) nounwind readnone
-
-!llvm.dbg.cu = !{!3}
-!llvm.module.flags = !{!49}
-
-!0 = !DISubprogram(name: "SVal", line: 11, isLocal: false, isDefinition: false, virtualIndex: 6, isOptimized: false, file: !48, scope: !1, type: !14)
-!1 = !DICompositeType(tag: DW_TAG_structure_type, name: "SVal", line: 1, size: 64, align: 64, file: !48, elements: !4)
-!2 = !DIFile(filename: "small.cc", directory: "/Users/manav/R8248330")
-!3 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, producer: "4.2.1 (Based on Apple Inc. build 5658) (LLVM build)", isOptimized: false, emissionKind: FullDebug, file: !48, enums: !47, retainedTypes: !47, globals: !47, imports:  !47)
-!4 = !{!5, !7, !0, !9}
-!5 = !DIDerivedType(tag: DW_TAG_member, name: "Data", line: 7, size: 64, align: 64, file: !48, scope: !1, baseType: !6)
-!6 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, file: !48, baseType: null)
-!7 = !DIDerivedType(tag: DW_TAG_member, name: "Kind", line: 8, size: 32, align: 32, offset: 64, file: !48, scope: !1, baseType: !8)
-!8 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned)
-!9 = !DISubprogram(name: "~SVal", line: 12, isLocal: false, isDefinition: false, virtualIndex: 6, isOptimized: false, file: !48, scope: !1, type: !10)
-!10 = !DISubroutineType(types: !11)
-!11 = !{null, !12, !13}
-!12 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial, file: !48, baseType: !1)
-!13 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
-!14 = !DISubroutineType(types: !15)
-!15 = !{null, !12}
-!16 = distinct !DISubprogram(name: "SVal", linkageName: "_ZN4SValC1Ev", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !3, file: !48, scope: !1, type: !14)
-!17 = distinct !DISubprogram(name: "foo", linkageName: "_Z3fooi4SVal", line: 16, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !3, file: !48, scope: !2, type: !18)
-!18 = !DISubroutineType(types: !19)
-!19 = !{!13, !13, !1}
-!20 = distinct !DISubprogram(name: "main", linkageName: "main", line: 23, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !3, file: !48, scope: !2, type: !21)
-!21 = !DISubroutineType(types: !22)
-!22 = !{!13}
-!23 = !DILocalVariable(name: "i", line: 16, arg: 1, scope: !17, file: !2, type: !13)
-!24 = !DILocation(line: 16, scope: !17)
-!25 = !DILocalVariable(name: "location", line: 16, arg: 2, scope: !17, file: !2, type: !26)
-!26 = !DIDerivedType(tag: DW_TAG_reference_type, name: "SVal", size: 32, align: 32, file: !48, scope: !2, baseType: !1)
-!27 = !DILocation(line: 17, scope: !28)
-!28 = distinct !DILexicalBlock(line: 16, column: 0, file: !2, scope: !17)
-!29 = !DILocation(line: 18, scope: !28)
-!30 = !DILocation(line: 20, scope: !28)
-!31 = !DILocalVariable(name: "this", line: 11, arg: 1, scope: !16, file: !2, type: !32)
-!32 = !DIDerivedType(tag: DW_TAG_const_type, flags: DIFlagArtificial, file: !48, scope: !2, baseType: !33)
-!33 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, file: !48, scope: !2, baseType: !1)
-!34 = !DILocation(line: 11, scope: !16)
-!35 = !DILocation(line: 11, scope: !36)
-!36 = distinct !DILexicalBlock(line: 11, column: 0, file: !48, scope: !37)
-!37 = distinct !DILexicalBlock(line: 11, column: 0, file: !48, scope: !16)
-!38 = !DILocalVariable(name: "v", line: 24, scope: !39, file: !2, type: !1)
-!39 = distinct !DILexicalBlock(line: 23, column: 0, file: !48, scope: !40)
-!40 = distinct !DILexicalBlock(line: 23, column: 0, file: !48, scope: !20)
-!41 = !DILocation(line: 24, scope: !39)
-!42 = !DILocation(line: 25, scope: !39)
-!43 = !DILocation(line: 26, scope: !39)
-!44 = !DILocalVariable(name: "k", line: 26, scope: !39, file: !2, type: !13)
-!45 = !DILocation(line: 27, scope: !39)
-!47 = !{}
-!48 = !DIFile(filename: "small.cc", directory: "/Users/manav/R8248330")
-!49 = !{i32 1, !"Debug Info Version", i32 3}
-
 ; CHECK: @ DW_OP_breg
 
+%struct.SVal = type { i8*, i32 }
+
+define i32 @_Z3fooi4SVal(i32 %i, %struct.SVal* noalias %location) #0 !dbg !4 {
+entry:
+  %"alloca point" = bitcast i32 0 to i32
+  call void @llvm.dbg.value(metadata i32 %i, metadata !21, metadata !DIExpression()), !dbg !22
+  call void @llvm.dbg.value(metadata %struct.SVal* %location, metadata !23, metadata !DIExpression()), !dbg !22
+  %tmp = icmp ne i32 %i, 0, !dbg !25
+  br i1 %tmp, label %bb, label %bb1, !dbg !25
+
+bb:                                               ; preds = %entry
+  %tmp1 = getelementptr inbounds %struct.SVal, %struct.SVal* %location, i32 0, i32 1, !dbg !27
+  %tmp2 = load i32, i32* %tmp1, align 8, !dbg !27
+  %tmp3 = add i32 %tmp2, %i, !dbg !27
+  br label %bb2, !dbg !27
+
+bb1:                                              ; preds = %entry
+  %tmp4 = getelementptr inbounds %struct.SVal, %struct.SVal* %location, i32 0, i32 1, !dbg !28
+  %tmp5 = load i32, i32* %tmp4, align 8, !dbg !28
+  %tmp6 = sub i32 %tmp5, 1, !dbg !28
+  br label %bb2, !dbg !28
+
+bb2:                                              ; preds = %bb1, %bb
+  %.0 = phi i32 [ %tmp3, %bb ], [ %tmp6, %bb1 ]
+  br label %return, !dbg !27
+
+return:                                           ; preds = %bb2
+  ret i32 %.0, !dbg !27
+}
+
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind ssp }
+attributes #1 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "4.2.1 (Based on Apple Inc. build 5658) (LLVM build)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !2, globals: !2, imports: !2)
+!1 = !DIFile(filename: "small.cc", directory: "/Users/manav/R8248330")
+!2 = !{}
+!3 = !{i32 1, !"Debug Info Version", i32 3}
+!4 = distinct !DISubprogram(name: "foo", linkageName: "_Z3fooi4SVal", scope: !1, file: !1, line: 16, type: !5, virtualIndex: 6, spFlags: DISPFlagDefinition, unit: !0)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7, !7, !8}
+!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
+!8 = !DICompositeType(tag: DW_TAG_structure_type, name: "SVal", file: !1, line: 1, size: 64, align: 64, elements: !9)
+!9 = !{!10, !12, !14, !18}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "Data", scope: !8, file: !1, line: 7, baseType: !11, size: 64, align: 64)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, file: !1, baseType: null, size: 64, align: 64)
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "Kind", scope: !8, file: !1, line: 8, baseType: !13, size: 32, align: 32, offset: 64)
+!13 = !DIBasicType(name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned)
+!14 = !DISubprogram(name: "SVal", scope: !8, file: !1, line: 11, type: !15, virtualIndex: 6, spFlags: 0)
+!15 = !DISubroutineType(types: !16)
+!16 = !{null, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, file: !1, baseType: !8, size: 64, align: 64, flags: DIFlagArtificial)
+!18 = !DISubprogram(name: "~SVal", scope: !8, file: !1, line: 12, type: !19, virtualIndex: 6, spFlags: 0)
+!19 = !DISubroutineType(types: !20)
+!20 = !{null, !17, !7}
+!21 = !DILocalVariable(name: "i", arg: 1, scope: !4, file: !1, line: 16, type: !7)
+!22 = !DILocation(line: 16, scope: !4)
+!23 = !DILocalVariable(name: "location", arg: 2, scope: !4, file: !1, line: 16, type: !24)
+!24 = !DIDerivedType(tag: DW_TAG_reference_type, name: "SVal", scope: !1, file: !1, baseType: !8, size: 32, align: 32)
+!25 = !DILocation(line: 17, scope: !26)
+!26 = distinct !DILexicalBlock(scope: !4, file: !1, line: 16)
+!27 = !DILocation(line: 18, scope: !26)
+!28 = !DILocation(line: 20, scope: !26)