From eec78653c82aeec9aade3b9e611662a2bef3acdd Mon Sep 17 00:00:00 2001 From: Quentin Colombet Date: Thu, 22 Dec 2016 22:50:34 +0000 Subject: [PATCH] [GlobalISel] More fix for the size vs. type typo. NFC. I missed those in my previous commit (r290378). llvm-svn: 290387 --- lib/CodeGen/MIRParser/MIParser.cpp | 6 +++--- lib/CodeGen/MachineVerifier.cpp | 2 +- .../CodeGen/MIR/AArch64/generic-virtual-registers-error.mir | 2 +- .../generic-virtual-registers-with-regbank-error.mir | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/MIRParser/MIParser.cpp b/lib/CodeGen/MIRParser/MIParser.cpp index 35dab438738..c8bed0890dd 100644 --- a/lib/CodeGen/MIRParser/MIParser.cpp +++ b/lib/CodeGen/MIRParser/MIParser.cpp @@ -1042,12 +1042,12 @@ bool MIParser::parseRegisterOperand(MachineOperand &Dest, MRI.setType(Reg, Ty); } else if (TargetRegisterInfo::isVirtualRegister(Reg)) { - // Generic virtual registers must have a size. - // If we end up here this means the size hasn't been specified and + // Generic virtual registers must have a type. + // If we end up here this means the type hasn't been specified and // this is bad! if (RegInfo->Kind == VRegInfo::GENERIC || RegInfo->Kind == VRegInfo::REGBANK) - return error("generic virtual registers must have a size"); + return error("generic virtual registers must have a type"); } Dest = MachineOperand::CreateReg( Reg, Flags & RegState::Define, Flags & RegState::Implicit, diff --git a/lib/CodeGen/MachineVerifier.cpp b/lib/CodeGen/MachineVerifier.cpp index 7eb42ecdf0a..426a4666c64 100644 --- a/lib/CodeGen/MachineVerifier.cpp +++ b/lib/CodeGen/MachineVerifier.cpp @@ -1023,7 +1023,7 @@ MachineVerifier::visitMachineOperand(const MachineOperand *MO, unsigned MONum) { return; } - // The gvreg must have a size and it must not have a SubIdx. + // The gvreg must have a type and it must not have a SubIdx. LLT Ty = MRI->getType(Reg); if (!Ty.isValid()) { report("Generic virtual register must have a valid type", MO, diff --git a/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir b/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir index adf711a8c67..d63c2ef6e87 100644 --- a/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir +++ b/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir @@ -15,7 +15,7 @@ registers: body: | bb.0: liveins: %w0 - ; ERR: generic virtual registers must have a size + ; ERR: generic virtual registers must have a type ; ERR-NEXT: %0 ; ERR: Unable to initialize machine function %0 = G_ADD i32 %w0, %w0 diff --git a/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir b/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir index f80f4ee0cdb..e331179773d 100644 --- a/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir +++ b/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir @@ -16,7 +16,7 @@ registers: body: | bb.0: liveins: %w0 - ; ERR: generic virtual registers must have a size + ; ERR: generic virtual registers must have a type ; ERR-NEXT: %0 ; ERR: Unable to initialize machine function %0 = G_ADD i32 %w0, %w0