diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
| commit | 5c897cf45a7b9df227e0c562c27454f56ba86c20 (patch) | |
| tree | ae3a9ea4d11bfb20379639dd9ca0951ce411e73a /lib/VMCore/Verifier.cpp | |
| parent | 89758b0545198f9a3876f0deb747146cbd84ce61 (diff) | |
| parent | a8a0a155de16830b8fcab539ba2ec21de3145532 (diff) | |
Merge commit 'a8a0a155de16830b8fcab539ba2ec21de3145532'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
The Intel folks switched some of the FrameLowering code to use
X86RegisterInfo::getSlotSize isntead of pointer size, thus reducing
our localmods in that file.
Diffstat (limited to 'lib/VMCore/Verifier.cpp')
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index fd629b485a..eb40b09d29 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -705,6 +705,7 @@ void Verifier::visitFunction(Function &F) { case CallingConv::Cold: case CallingConv::X86_FastCall: case CallingConv::X86_ThisCall: + case CallingConv::Intel_OCL_BI: case CallingConv::PTX_Kernel: case CallingConv::PTX_Device: Assert1(!F.isVarArg(), |