From 06bd94ca1b397e5a4bf7ebfa46ebd4b52d47f31a Mon Sep 17 00:00:00 2001
From: Karl Schimpf <kschimpf@google.com>
Date: Thu, 3 Sep 2015 15:41:37 +0000
Subject: [PATCH] Fix SEGV in InlineAsm::ConstraintInfo::Parse.

Summary:
Fixes bug 24646. Previous code was not checking if an index into a vector
was valid, resulting in a SEGV. Fixed by assuming the construct can't
be parsed when given this input.

Reformat and add test.

Differential Revision: http://reviews.llvm.org/D12539

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246774 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/IR/InlineAsm.cpp                        |   3 ++-
 test/Assembler/invalid-inline-constraint.ll | Bin 0 -> 314 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 test/Assembler/invalid-inline-constraint.ll

diff --git a/lib/IR/InlineAsm.cpp b/lib/IR/InlineAsm.cpp
index b7309b4f67b..15d3b830b8f 100644
--- a/lib/IR/InlineAsm.cpp
+++ b/lib/IR/InlineAsm.cpp
@@ -159,7 +159,8 @@ bool InlineAsm::ConstraintInfo::Parse(StringRef Str,
       // If Operand N already has a matching input, reject this.  An output
       // can't be constrained to the same value as multiple inputs.
       if (isMultipleAlternative) {
-        if (multipleAlternativeIndex >= ConstraintsSoFar[N].multipleAlternatives.size())
+        if (multipleAlternativeIndex >=
+            ConstraintsSoFar[N].multipleAlternatives.size())
           return true;
         InlineAsm::SubConstraintInfo &scInfo =
           ConstraintsSoFar[N].multipleAlternatives[multipleAlternativeIndex];
diff --git a/test/Assembler/invalid-inline-constraint.ll b/test/Assembler/invalid-inline-constraint.ll
new file mode 100644
index 0000000000000000000000000000000000000000..84b2e5c87da524842c444fd25b4d730f4a0bcc0d
GIT binary patch
literal 314
zcmZ9GT}#6-6oz-5-{8edMcJUPAC!TeQ=uq=;DzY5)Fx?zX)=<mt90FOH+2_+H#s@a
zdmheN<MsU|htdvGcI{PZaf1ts^!75r0gpnmqG8pSXN0Wr#;mjW+|@Z6=e9PFqDfn7
zQ%9cK$ToWa;eX4j7I%Vf(rlHjyjVOv6wf)BG1}x1sw<_SaNk=7u8jv$D2CFusI;=q
zltMZ9DpXAfWqe9I?Uj43^?czE-l@G%6a%SBDNos?TR|D)oK+4%t2^{@i1REB!eDb8
n`gjcen_Q3KlpW&muQ?4K`yoxnV7{2mem8jcKT`C}Fh_m>zuRTP

literal 0
HcmV?d00001

-- 
2.34.1