diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-11 17:01:28 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-11 17:01:28 -0700 |
| commit | 4db6bb7837c58641c4416e87643833bca4945841 (patch) | |
| tree | 5f06f1dd5968c63c8e94cc077fd6016165ba0931 /lib/Bitcode | |
| parent | 6b4efcb6bb663678c5cdd63a22e1ccc5ec6819f1 (diff) | |
| parent | 2fa8af224ea026f9432e833fd6f42a216423a010 (diff) | |
Merge commit '2fa8af224ea026f9432e833fd6f42a216423a010'
Conflicts:
lib/ExecutionEngine/JIT/JITEmitter.cpp
lib/MC/MCELFStreamer.cpp
lib/Target/ARM/ARMAsmPrinter.h
lib/Target/X86/X86RegisterInfo.td
lib/Target/X86/X86TargetMachine.cpp
tools/llc/llc.cpp
Diffstat (limited to 'lib/Bitcode')
| -rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index c3bffc5d63..64cedd212d 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -482,7 +482,7 @@ bool BitcodeReader::ParseAttributeBlock() { } for (unsigned i = 0, e = Record.size(); i != e; i += 2) { - if (Attributes(Record[i+1]) != Attribute::None) + if (Attributes(Record[i+1]).hasAttributes()) Attrs.push_back(AttributeWithIndex::get(Record[i], Attributes(Record[i+1]))); } |