RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

Untabify.

Browse Source 
llvm-svn: 311875
This commit is contained in:
NAKAMURA Takumi 2017-08-28 06:47:47 +00:00
parent 80aa3b549e
commit b40db7c573
20 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/llvm/ExecutionEngine/Orc/RPCSerialization.h
View File

@ -361,13 +361,13 @@ public:
std::lock_guard<std::recursive_mutex> Lock(SerializersMutex);
// FIXME: Move capture Serialize once we have C++14.
Serializers[ErrorInfoT::classID()] =
[KeyName, Serialize](ChannelT &C, const ErrorInfoBase &EIB) -> Error {
assert(EIB.dynamicClassID() == ErrorInfoT::classID() &&
"Serializer called for wrong error type");
if (auto Err = serializeSeq(C, *KeyName))
return Err;
return Serialize(C, static_cast<const ErrorInfoT&>(EIB));
};
[KeyName, Serialize](ChannelT &C, const ErrorInfoBase &EIB) -> Error {
assert(EIB.dynamicClassID() == ErrorInfoT::classID() &&
"Serializer called for wrong error type");
if (auto Err = serializeSeq(C, *KeyName))
return Err;
return Serialize(C, static_cast<const ErrorInfoT &>(EIB));
};
}
}

10
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -534,11 +534,11 @@ sortGlobalExprs(SmallVectorImpl<DwarfCompileUnit::GlobalExpr> &GVEs) {
std::sort(GVEs.begin(), GVEs.end(),
[](DwarfCompileUnit::GlobalExpr A, DwarfCompileUnit::GlobalExpr B) {
if (A.Expr != B.Expr && A.Expr && B.Expr) {
auto FragmentA = A.Expr->getFragmentInfo();
auto FragmentB = B.Expr->getFragmentInfo();
if (FragmentA && FragmentB)
return FragmentA->OffsetInBits < FragmentB->OffsetInBits;
}
auto FragmentA = A.Expr->getFragmentInfo();
auto FragmentB = B.Expr->getFragmentInfo();
if (FragmentA && FragmentB)
return FragmentA->OffsetInBits < FragmentB->OffsetInBits;
}
return false;
});
GVEs.erase(std::unique(GVEs.begin(), GVEs.end(),

2
lib/CodeGen/AsmPrinter/DwarfExpression.cpp
View File

@ -146,7 +146,7 @@ bool DwarfExpression::addMachineReg(const TargetRegisterInfo &TRI,
DwarfRegs.push_back(
{Reg, std::min<unsigned>(Size, MaxSize - Offset), "sub-register"});
if (Offset >= MaxSize)
break;
break;
// Mark it as emitted.
Coverage.set(Offset, Offset + Size);

6
lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
View File

@ -225,9 +225,9 @@ public:
bool removeModule(Module *M) override {
for (auto I = LocalModules.begin(), E = LocalModules.end(); I != E; ++I) {
if (I->get() == M) {
ShouldDelete[M] = false;
LocalModules.erase(I);
return true;
ShouldDelete[M] = false;
LocalModules.erase(I);
return true;
}
}
return false;

8
lib/MC/MCParser/AsmParser.cpp
View File

@ -1327,10 +1327,10 @@ bool AsmParser::isAltmacroString(SMLoc &StrLoc, SMLoc &EndLoc) {
assert((StrLoc.getPointer() != NULL) &&
"Argument to the function cannot be a NULL value");
const char *CharPtr = StrLoc.getPointer();
while ((*CharPtr != '>') && (*CharPtr != '\n') &&
(*CharPtr != '\r') && (*CharPtr != '\0')){
if(*CharPtr == '!')
CharPtr++;
while ((*CharPtr != '>') && (*CharPtr != '\n') && (*CharPtr != '\r') &&
(*CharPtr != '\0')) {
if (*CharPtr == '!')
CharPtr++;
CharPtr++;
}
if (*CharPtr == '>') {

24
lib/Object/MachOObjectFile.cpp
View File

@ -500,7 +500,7 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj,
"past the end of the file");
if (Error Err = checkOverlappingElement(Elements, Dysymtab.modtaboff,
Dysymtab.nmodtab * sizeof_modtab,
"module table"))
"module table"))
return Err;
if (Dysymtab.extrefsymoff > FileSize)
return malformedError("extrefsymoff field of LC_DYSYMTAB command " +
@ -516,8 +516,8 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj,
"past the end of the file");
if (Error Err = checkOverlappingElement(Elements, Dysymtab.extrefsymoff,
Dysymtab.nextrefsyms *
sizeof(MachO::dylib_reference),
"reference table"))
sizeof(MachO::dylib_reference),
"reference table"))
return Err;
if (Dysymtab.indirectsymoff > FileSize)
return malformedError("indirectsymoff field of LC_DYSYMTAB command " +
@ -550,8 +550,8 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj,
"the file");
if (Error Err = checkOverlappingElement(Elements, Dysymtab.extreloff,
Dysymtab.nextrel *
sizeof(MachO::relocation_info),
"external relocation table"))
sizeof(MachO::relocation_info),
"external relocation table"))
return Err;
if (Dysymtab.locreloff > FileSize)
return malformedError("locreloff field of LC_DYSYMTAB command " +
@ -567,8 +567,8 @@ static Error checkDysymtabCommand(const MachOObjectFile &Obj,
"the file");
if (Error Err = checkOverlappingElement(Elements, Dysymtab.locreloff,
Dysymtab.nlocrel *
sizeof(MachO::relocation_info),
"local relocation table"))
sizeof(MachO::relocation_info),
"local relocation table"))
return Err;
*DysymtabLoadCmd = Load.Ptr;
return Error::success();
@ -3088,7 +3088,7 @@ void MachORebaseEntry::moveNext() {
Twine(error) + " for opcode at: 0x" +
Twine::utohexstr(OpcodeStart - Opcodes.begin()));
moveToEnd();
return;
return;
}
DEBUG_WITH_TYPE(
"mach-o-rebase",
@ -3129,7 +3129,7 @@ void MachORebaseEntry::moveNext() {
Twine(error) + " for opcode at: 0x" +
Twine::utohexstr(OpcodeStart - Opcodes.begin()));
moveToEnd();
return;
return;
}
DEBUG_WITH_TYPE(
"mach-o-rebase",
@ -3167,7 +3167,7 @@ void MachORebaseEntry::moveNext() {
Twine(error) + " for opcode at: 0x" +
Twine::utohexstr(OpcodeStart - Opcodes.begin()));
moveToEnd();
return;
return;
}
DEBUG_WITH_TYPE(
"mach-o-rebase",
@ -3220,7 +3220,7 @@ void MachORebaseEntry::moveNext() {
Twine(error) + " for opcode at: 0x" +
Twine::utohexstr(OpcodeStart - Opcodes.begin()));
moveToEnd();
return;
return;
}
DEBUG_WITH_TYPE(
"mach-o-rebase",
@ -3770,7 +3770,7 @@ void MachOBindEntry::moveNext() {
Twine(error) + " for opcode at: 0x" +
Twine::utohexstr(OpcodeStart - Opcodes.begin()));
moveToEnd();
return;
return;
}
DEBUG_WITH_TYPE(
"mach-o-bind",

8
lib/Support/Unix/Threading.inc
View File

@ -108,14 +108,14 @@ uint64_t llvm::get_threadid() {
static constexpr uint32_t get_max_thread_name_length_impl() {
#if defined(__NetBSD__)
return PTHREAD_MAX_NAMELEN_NP;
return PTHREAD_MAX_NAMELEN_NP;
#elif defined(__APPLE__)
return 64;
return 64;
#elif defined(__linux__)
#if HAVE_PTHREAD_SETNAME_NP
return 16;
return 16;
#else
return 0;
return 0;
#endif
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
return 16;

2
lib/Support/Windows/Path.inc
View File

@ -253,7 +253,7 @@ std::error_code create_link(const Twine &to, const Twine &from) {
}
std::error_code create_hard_link(const Twine &to, const Twine &from) {
return create_link(to, from);
return create_link(to, from);
}
std::error_code remove(const Twine &path, bool IgnoreNonExisting) {

2
lib/TableGen/Record.cpp
View File

@ -496,7 +496,7 @@ Init *ListInit::convertInitializerTo(RecTy *Ty) const {
Elements.push_back(CI);
if (CI != I)
Changed = true;
} else
} else
return nullptr;
if (!Changed)

4
lib/Target/AArch64/AArch64MacroFusion.cpp
View File

@ -33,8 +33,8 @@ static bool shouldScheduleAdjacent(const TargetInstrInfo &TII,
// Assume wildcards for unspecified instrs.
unsigned FirstOpcode =
FirstMI ? FirstMI->getOpcode()
: static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END);
FirstMI ? FirstMI->getOpcode()
: static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END);
unsigned SecondOpcode = SecondMI.getOpcode();
if (ST.hasArithmeticBccFusion())

8
lib/Target/ARM/ARMTargetMachine.cpp
View File

@ -227,10 +227,10 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T, const Triple &TT,
Options.EABIVersion == EABI::Unknown) {
// musl is compatible with glibc with regard to EABI version
if ((TargetTriple.getEnvironment() == Triple::GNUEABI ||
TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
TargetTriple.getEnvironment() == Triple::MuslEABI ||
TargetTriple.getEnvironment() == Triple::MuslEABIHF) &&
!(TargetTriple.isOSWindows() || TargetTriple.isOSDarwin()))
TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
TargetTriple.getEnvironment() == Triple::MuslEABI ||
TargetTriple.getEnvironment() == Triple::MuslEABIHF) &&
!(TargetTriple.isOSWindows() || TargetTriple.isOSDarwin()))
this->Options.EABIVersion = EABI::GNU;
else
this->Options.EABIVersion = EABI::EABI5;

4
lib/Target/PowerPC/PPCCTRLoops.cpp
View File

@ -243,8 +243,8 @@ bool PPCCTRLoops::mightUseCTR(BasicBlock *BB) {
if (CallInst *CI = dyn_cast<CallInst>(J)) {
// Inline ASM is okay, unless it clobbers the ctr register.
if (InlineAsm *IA = dyn_cast<InlineAsm>(CI->getCalledValue())) {
if (asmClobbersCTR(IA))
return true;
if (asmClobbersCTR(IA))
return true;
continue;
}

44
lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@ -2134,31 +2134,31 @@ void AddressSanitizer::initializeCallbacks(Module &M) {
Args2.push_back(ExpType);
Args1.push_back(ExpType);
}
AsanErrorCallbackSized[AccessIsWrite][Exp] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
kAsanReportErrorTemplate + ExpStr + TypeStr + SuffixStr +
EndingStr,
FunctionType::get(IRB.getVoidTy(), Args2, false)));
AsanErrorCallbackSized[AccessIsWrite][Exp] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
kAsanReportErrorTemplate + ExpStr + TypeStr + SuffixStr +
EndingStr,
FunctionType::get(IRB.getVoidTy(), Args2, false)));
AsanMemoryAccessCallbackSized[AccessIsWrite][Exp] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
ClMemoryAccessCallbackPrefix + ExpStr + TypeStr + "N" + EndingStr,
FunctionType::get(IRB.getVoidTy(), Args2, false)));
AsanMemoryAccessCallbackSized[AccessIsWrite][Exp] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
ClMemoryAccessCallbackPrefix + ExpStr + TypeStr + "N" + EndingStr,
FunctionType::get(IRB.getVoidTy(), Args2, false)));
for (size_t AccessSizeIndex = 0; AccessSizeIndex < kNumberOfAccessSizes;
AccessSizeIndex++) {
const std::string Suffix = TypeStr + itostr(1ULL << AccessSizeIndex);
AsanErrorCallback[AccessIsWrite][Exp][AccessSizeIndex] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
kAsanReportErrorTemplate + ExpStr + Suffix + EndingStr,
FunctionType::get(IRB.getVoidTy(), Args1, false)));
for (size_t AccessSizeIndex = 0; AccessSizeIndex < kNumberOfAccessSizes;
AccessSizeIndex++) {
const std::string Suffix = TypeStr + itostr(1ULL << AccessSizeIndex);
AsanErrorCallback[AccessIsWrite][Exp][AccessSizeIndex] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
kAsanReportErrorTemplate + ExpStr + Suffix + EndingStr,
FunctionType::get(IRB.getVoidTy(), Args1, false)));
AsanMemoryAccessCallback[AccessIsWrite][Exp][AccessSizeIndex] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
ClMemoryAccessCallbackPrefix + ExpStr + Suffix + EndingStr,
FunctionType::get(IRB.getVoidTy(), Args1, false)));
}
}
AsanMemoryAccessCallback[AccessIsWrite][Exp][AccessSizeIndex] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction(
ClMemoryAccessCallbackPrefix + ExpStr + Suffix + EndingStr,
FunctionType::get(IRB.getVoidTy(), Args1, false)));
}
}
}
const std::string MemIntrinCallbackPrefix =

2
lib/Transforms/Scalar/SROA.cpp
View File

@ -4062,7 +4062,7 @@ bool SROA::splitAlloca(AllocaInst &AI, AllocaSlices &AS) {
uint64_t Size = Fragment.Size;
if (ExprFragment) {
uint64_t AbsEnd =
ExprFragment->OffsetInBits + ExprFragment->SizeInBits;
ExprFragment->OffsetInBits + ExprFragment->SizeInBits;
if (Start >= AbsEnd)
// No need to describe a SROAed padding.
continue;

4
tools/lli/OrcLazyJIT.h
View File

@ -62,8 +62,8 @@ public:
IndirectStubsManagerBuilder IndirectStubsMgrBuilder,
bool InlineStubs)
: TM(std::move(TM)), DL(this->TM->createDataLayout()),
CCMgr(std::move(CCMgr)),
ObjectLayer([]() { return std::make_shared<SectionMemoryManager>(); }),
CCMgr(std::move(CCMgr)),
ObjectLayer([]() { return std::make_shared<SectionMemoryManager>(); }),
CompileLayer(ObjectLayer, orc::SimpleCompiler(*this->TM)),
IRDumpLayer(CompileLayer, createDebugDumper()),
CODLayer(IRDumpLayer, extractSingleFunction, *this->CCMgr,

17
tools/lli/lli.cpp
View File

@ -620,15 +620,14 @@ int main(int argc, char **argv, char * const *envp) {
std::move(RemoteMM));
// Forward MCJIT's symbol resolution calls to the remote.
static_cast<ForwardingMemoryManager*>(RTDyldMM)->setResolver(
orc::createLambdaResolver(
[](const std::string &Name) { return nullptr; },
[&](const std::string &Name) {
if (auto Addr = ExitOnErr(R->getSymbolAddress(Name)))
return JITSymbol(Addr, JITSymbolFlags::Exported);
return JITSymbol(nullptr);
}
));
static_cast<ForwardingMemoryManager *>(RTDyldMM)->setResolver(
orc::createLambdaResolver(
[](const std::string &Name) { return nullptr; },
[&](const std::string &Name) {
if (auto Addr = ExitOnErr(R->getSymbolAddress(Name)))
return JITSymbol(Addr, JITSymbolFlags::Exported);
return JITSymbol(nullptr);
}));
// Grab the target address of the JIT'd main function on the remote and call
// it.

62
tools/llvm-objdump/MachODump.cpp
View File

@ -1226,7 +1226,7 @@ static void ProcessMachO(StringRef Name, MachOObjectFile *MachOOF,
if (Disassemble) {
if (MachOOF->getHeader().filetype == MachO::MH_KEXT_BUNDLE &&
MachOOF->getHeader().cputype == MachO::CPU_TYPE_ARM64)
MachOOF->getHeader().cputype == MachO::CPU_TYPE_ARM64)
DisassembleMachO(FileName, MachOOF, "__TEXT_EXEC", "__text");
else
DisassembleMachO(FileName, MachOOF, "__TEXT", "__text");
@ -6013,7 +6013,7 @@ static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
xp = xar_iter_new();
if(!xp){
errs() << "Can't obtain an xar iterator for xar archive "
<< XarFilename.c_str() << "\n";
<< XarFilename.c_str() << "\n";
xar_close(xar);
return;
}
@ -6026,12 +6026,12 @@ static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
#if 0 // Useful for debugging.
outs() << "key: " << key << " value: " << val << "\n";
#endif
if(strcmp(key, "name") == 0)
member_name = val;
if(strcmp(key, "type") == 0)
member_type = val;
if(strcmp(key, "data/size") == 0)
member_size_string = val;
if (strcmp(key, "name") == 0)
member_name = val;
if (strcmp(key, "type") == 0)
member_type = val;
if (strcmp(key, "data/size") == 0)
member_size_string = val;
}
/*
* If we find a file with a name, date/size and type properties
@ -6044,38 +6044,38 @@ static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
char *endptr;
member_size = strtoul(member_size_string, &endptr, 10);
if (*endptr == '\0' && member_size != 0) {
char *buffer = (char *) ::operator new (member_size);
if (xar_extract_tobuffersz(xar, xf, &buffer, &member_size) == 0) {
char *buffer = (char *)::operator new(member_size);
if (xar_extract_tobuffersz(xar, xf, &buffer, &member_size) == 0) {
#if 0 // Useful for debugging.
outs() << "xar member: " << member_name << " extracted\n";
#endif
// Set the XarMemberName we want to see printed in the header.
std::string OldXarMemberName;
// If XarMemberName is already set this is nested. So
// save the old name and create the nested name.
if (!XarMemberName.empty()) {
OldXarMemberName = XarMemberName;
std::string OldXarMemberName;
// If XarMemberName is already set this is nested. So
// save the old name and create the nested name.
if (!XarMemberName.empty()) {
OldXarMemberName = XarMemberName;
XarMemberName =
(Twine("[") + XarMemberName + "]" + member_name).str();
} else {
OldXarMemberName = "";
XarMemberName = member_name;
}
// See if this is could be a xar file (nested).
if (member_size >= sizeof(struct xar_header)) {
(Twine("[") + XarMemberName + "]" + member_name).str();
} else {
OldXarMemberName = "";
XarMemberName = member_name;
}
// See if this is could be a xar file (nested).
if (member_size >= sizeof(struct xar_header)) {
#if 0 // Useful for debugging.
outs() << "could be a xar file: " << member_name << "\n";
#endif
memcpy((char *)&XarHeader, buffer, sizeof(struct xar_header));
memcpy((char *)&XarHeader, buffer, sizeof(struct xar_header));
if (sys::IsLittleEndianHost)
swapStruct(XarHeader);
if(XarHeader.magic == XAR_HEADER_MAGIC)
DumpBitcodeSection(O, buffer, member_size, verbose,
swapStruct(XarHeader);
if (XarHeader.magic == XAR_HEADER_MAGIC)
DumpBitcodeSection(O, buffer, member_size, verbose,
PrintXarHeader, PrintXarFileHeaders,
XarMemberName);
}
XarMemberName = OldXarMemberName;
}
XarMemberName);
}
XarMemberName = OldXarMemberName;
}
delete buffer;
}
}
@ -6703,7 +6703,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
if (!DisSymName.empty() && DisSymName == SymName) {
outs() << "-dis-symname: " << DisSymName << " not in the section\n";
return;
}
}
continue;
}
// The __mh_execute_header is special and we need to deal with that fact

2
unittests/ADT/APFloatTest.cpp
View File

@ -1464,7 +1464,7 @@ TEST(APFloatTest, getZero) {
EXPECT_TRUE(test.bitwiseIsEqual(expected));
for (unsigned j = 0, je = GetZeroTest[i].bitPatternLength; j < je; ++j) {
EXPECT_EQ(GetZeroTest[i].bitPattern[j],
test.bitcastToAPInt().getRawData()[j]);
test.bitcastToAPInt().getRawData()[j]);
}
}
}

5
unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
View File

@ -89,8 +89,9 @@ public:
bool needsToReserveAllocationSpace() override { return true; }
void reserveAllocationSpace(uintptr_t CodeSize, uint32_t CodeAlign,
uintptr_t DataSizeRO, uint32_t RODataAlign,
uintptr_t DataSizeRW, uint32_t RWDataAlign) override {
uintptr_t DataSizeRO, uint32_t RODataAlign,
uintptr_t DataSizeRW,
uint32_t RWDataAlign) override {
ReservedCodeSize = CodeSize;
ReservedDataSizeRO = DataSizeRO;
ReservedDataSizeRW = DataSizeRW;

6
unittests/Support/FileOutputBufferTest.cpp
View File

@ -40,7 +40,7 @@ TEST(FileOutputBuffer, Test) {
// TEST 1: Verify commit case.
SmallString<128> File1(TestDirectory);
File1.append("/file1");
File1.append("/file1");
{
ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
FileOutputBuffer::create(File1, 8192);
@ -79,7 +79,7 @@ TEST(FileOutputBuffer, Test) {
// TEST 3: Verify sizing down case.
SmallString<128> File3(TestDirectory);
File3.append("/file3");
File3.append("/file3");
{
ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
FileOutputBuffer::create(File3, 8192000);
@ -100,7 +100,7 @@ TEST(FileOutputBuffer, Test) {
// TEST 4: Verify file can be made executable.
SmallString<128> File4(TestDirectory);
File4.append("/file4");
File4.append("/file4");
{
ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
FileOutputBuffer::create(File4, 8192, FileOutputBuffer::F_executable);