diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index f44af673fcd..e1c00cc4af0 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -1532,7 +1532,7 @@ bool LLParser::ParseInstructionMetadata(Instruction *Inst,
         return true;
       assert(ID.Kind == ValID::t_MDNode);
       if (ID.MDNodeVal->isFunctionLocal())
-        return TokError("unexpected function-local metadata");
+        return Error(Loc, "unexpected function-local metadata");
       Inst->setMetadata(MDK, ID.MDNodeVal);
     } else {
       unsigned NodeID = 0;
diff --git a/test/Assembler/functionlocal-metadata-attachments.ll b/test/Assembler/functionlocal-metadata-attachments.ll
new file mode 100644
index 00000000000..71d8fa1b0e1
--- /dev/null
+++ b/test/Assembler/functionlocal-metadata-attachments.ll
@@ -0,0 +1,7 @@
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
+
+define void @foo(i32 %v) {
+entry:
+; CHECK: <stdin>:[[@LINE+1]]:{{[0-9]+}}: error: unexpected function-local metadata
+  ret void, !foo !{i32 %v}
+}
diff --git a/test/Assembler/functionlocal-metadata-complex-1.ll b/test/Assembler/functionlocal-metadata-complex-1.ll
new file mode 100644
index 00000000000..81337db39fe
--- /dev/null
+++ b/test/Assembler/functionlocal-metadata-complex-1.ll
@@ -0,0 +1,10 @@
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
+
+define void @foo(i32 %v) {
+entry:
+; CHECK: <stdin>:[[@LINE+1]]:{{[0-9]+}}: error: unexpected operand after function-local metadata
+  call void @llvm.bar(metadata !{i32 %v, i32 0})
+  ret void
+}
+
+declare void @llvm.bar(metadata)
diff --git a/test/Assembler/functionlocal-metadata-complex-2.ll b/test/Assembler/functionlocal-metadata-complex-2.ll
new file mode 100644
index 00000000000..15a4412c535
--- /dev/null
+++ b/test/Assembler/functionlocal-metadata-complex-2.ll
@@ -0,0 +1,10 @@
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
+
+define void @foo(i32 %v) {
+entry:
+; CHECK: <stdin>:[[@LINE+1]]:{{[0-9]+}}: error: unexpected function-local metadata
+  call void @llvm.bar(metadata !{i32 0, i32 %v})
+  ret void
+}
+
+declare void @llvm.bar(metadata)
diff --git a/test/Assembler/functionlocal-metadata-complex-3.ll b/test/Assembler/functionlocal-metadata-complex-3.ll
new file mode 100644
index 00000000000..1590efa72b6
--- /dev/null
+++ b/test/Assembler/functionlocal-metadata-complex-3.ll
@@ -0,0 +1,10 @@
+; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
+
+define void @foo(i32 %v) {
+entry:
+; CHECK: <stdin>:[[@LINE+1]]:{{[0-9]+}}: error: unexpected nested function-local metadata
+  call void @llvm.bar(metadata !{metadata !{i32 %v}})
+  ret void
+}
+
+declare void @llvm.bar(metadata)
diff --git a/test/Bitcode/function-local-metadata.ll b/test/Bitcode/function-local-metadata.ll
new file mode 100644
index 00000000000..58fb64c9b4b
--- /dev/null
+++ b/test/Bitcode/function-local-metadata.ll
@@ -0,0 +1,35 @@
+; RUN: llvm-dis < %s.bc | FileCheck %s
+
+; Check that function-local metadata is dropped correctly when it's not a
+; direct argument to a call instruction.
+;
+; Bitcode assembled by llvm-as v3.5.0.
+
+define void @foo(i32 %v) {
+; CHECK: entry:
+entry:
+; CHECK-NEXT: call void @llvm.bar(metadata !{i32 %v})
+  call void @llvm.bar(metadata !{i32 %v})
+
+; Note: these supposedly legal instructions fired an assertion in llvm-as:
+;
+; Assertion failed: (I != ValueMap.end() && "Value not in slotcalculator!"), function getValueID, file lib/Bitcode/Writer/ValueEnumerator.cpp, line 138.
+;
+; So, I didn't test them; it looks like bitcode compatability is irrelevant.
+  ; call void @llvm.bar(metadata !{i32 0, i32 %v})
+  ; call void @llvm.bar(metadata !{i32 %v, i32 0})
+  ; call void @llvm.bar(metadata !{metadata !{}, i32 %v})
+  ; call void @llvm.bar(metadata !{i32 %v, metadata !{}})
+
+; CHECK-NEXT: call void @llvm.bar(metadata !0)
+; CHECK-NEXT: call void @llvm.bar(metadata !0)
+  call void @llvm.bar(metadata !{i32 %v, i32 %v})
+  call void @llvm.bar(metadata !{metadata !{i32 %v}})
+
+; CHECK-NEXT: ret void{{$}}
+  ret void, !baz !{i32 %v}
+}
+
+declare void @llvm.bar(metadata)
+
+; CHECK: !0 = metadata !{}
diff --git a/test/Bitcode/function-local-metadata.ll.bc b/test/Bitcode/function-local-metadata.ll.bc
new file mode 100644
index 00000000000..6323ca4a6a3
Binary files /dev/null and b/test/Bitcode/function-local-metadata.ll.bc differ