From 4f3a95e57a4a46648f790e5065bed0e64fe98d64 Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo@fhahn.com>
Date: Thu, 11 Jul 2019 10:53:40 +0000
Subject: [PATCH] Revert [BitcodeReader] Validate OpNum, before accessing
 Record array.

This reverts r365750 (git commit 8b222ecf2769ee133691f208f6166ce118c4a164)

llvm-dis runs out of memory while opening invalid-fcmp-opnum.bc on
llvm-hexagon-elf, probably because the bitcode file contains other
suspicious values.

http://lab.llvm.org:8011/builders/llvm-hexagon-elf/builds/21949

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@365757 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Bitcode/Reader/BitcodeReader.cpp      |   4 ----
 test/Bitcode/Inputs/invalid-fcmp-opnum.bc | Bin 908 -> 0 bytes
 test/Bitcode/invalid.test                 |   5 -----
 3 files changed, 9 deletions(-)
 delete mode 100644 test/Bitcode/Inputs/invalid-fcmp-opnum.bc

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 0d302b7dfaa..0ba76f0f371 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -4165,10 +4165,6 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
           popValue(Record, OpNum, NextValueNo, LHS->getType(), RHS))
         return error("Invalid record");
 
-      if (OpNum >= Record.size())
-        return error(
-            "Invalid record: operand number exceeded available operands");
-
       unsigned PredVal = Record[OpNum];
       bool IsFP = LHS->getType()->isFPOrFPVectorTy();
       FastMathFlags FMF;
diff --git a/test/Bitcode/Inputs/invalid-fcmp-opnum.bc b/test/Bitcode/Inputs/invalid-fcmp-opnum.bc
deleted file mode 100644
index 454a14b8611ac37baabb23893b20fa275fe4b2fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 908
zcmXX_O=uHO6rb%T*|m+6)do#;ciHU+<lx7WSWMjHkIC|viWO4)KtZu75~>H;rXfu$
zNYY)I=s(ITJ>=lQfd7NH96WdsX_8t)34S9zlwxQMBDDlRz=NQ(tq<Ps&AfSU=Dpv{
zM3lLe0Ve=f0KlkS>Ki)yw6*^BpS`DUG1eOPi*^8B;<c_05p-bNjg`vw-U-(%M{SHZ
zaF@{S{Z`t|TmBo(F#mQ$?si3V#_ROcu4A3vNN&(@3d)h(|G@2yGzX!vt!F+O9?s?)
z+Q*v~@rdn)0Kitfr?-dRB3!&~>F#-;V_4OThI9K+F5ji=Lrh;U=m$5mnZQgYclkDO
zw&*#W0(OaZcR}eBXmj#cj3ptO+y#KJg9J(J^U)c0zQM+wL@1~D^=dwnp{CN*L}A?C
z0*)^X{GNe6dxWo)xfew?E?GCiwB2<wR8vBEGE`6JlPYzUrltmws#4P`nMxy7K<@fB
zxMskH<hUX^R@<;0g+6AUTM^kMk*mb`xO78)qRFq6z#}sFL<{PqTyHy5Bh=L~>fjhk
zV9X%ZK<WsU@=&RtR=n+G23?@hxC<o;XsVFiv)+d5AK;HUxF(UKwIbUrvh@vIj<Jg(
zJD=qiW48B(5~wMG!UjIB`ezk?j+AGs`|+W_X5@FIT&miiUqb2`lu)(g7?mDDNf%1q
zNA4FV9P7aGH42*sTs`b)2yhK|A$YjuGG7VvZ$x%E%P)Umn+@(W!N*<0{*rR&o+j6$
zeSaGnL6d1JT^JtvZa7Q^_{;oajQu2XD`oB)!J7q(Tsvkvd0q3@t8z&RVM2aYf=xxv
z;b}GhtP^*NCUHG9HSM7ih3vUi2CmJ)k5Twd>Mg$s^UcQ2r3SY`@a7dibm6y%ZC7W)
zgZZMS&!`0@gxfADfmhX;7Q0Z~`YCK)XG`QZ>j1AA0Bksiss|rv@;yur8M?0pF;Pa9
z!2Xy301g4&mdGB{l30@iQ9|!OJYbF|Y?a?w91AMx&6P`pXaQ39ut0irk}&g6Gb%;^
w#)ZvXFJyXjP&St~<UIaE<{RBk&hCgG+$ZgmCQ?@fta}qaukS!0aC|fF4}u^iz5oCK

diff --git a/test/Bitcode/invalid.test b/test/Bitcode/invalid.test
index d1f9d7c0874..2a9af0626c6 100644
--- a/test/Bitcode/invalid.test
+++ b/test/Bitcode/invalid.test
@@ -235,8 +235,3 @@ RUN: not llvm-dis -disable-output %p/Inputs/invalid-nonpointer-atomicrmw.bc 2>&1
 RUN:   FileCheck --check-prefix=NONPOINTER-ATOMICRMW %s
 
 NONPOINTER-ATOMICRMW: Invalid record
-
-RUN: not llvm-dis -disable-output %p/Inputs/invalid-fcmp-opnum.bc 2>&1 | \
-RUN:   FileCheck --check-prefix=INVALID-FCMP-OPNUM %s
-
-INVALID-FCMP-OPNUM: Invalid record: operand number exceeded available operands
-- 
2.50.0