parent
0ca88e3863
commit
b461b1c785
|
@ -71,7 +71,7 @@ private:
|
|||
void Resolver::handleFile(const File &file) {
|
||||
uint32_t resolverState = Resolver::StateNoChange;
|
||||
const SharedLibraryFile *sharedLibraryFile =
|
||||
llvm::dyn_cast<SharedLibraryFile>(&file);
|
||||
dyn_cast<SharedLibraryFile>(&file);
|
||||
|
||||
for (const DefinedAtom *atom : file.defined()) {
|
||||
doDefinedAtom(*atom);
|
||||
|
@ -189,7 +189,7 @@ bool Resolver::maybeAddSectionGroupOrGnuLinkOnce(const DefinedAtom &atom) {
|
|||
if (_context.getAllowDuplicates())
|
||||
return true;
|
||||
const DefinedAtom *prevGroup =
|
||||
llvm::dyn_cast<DefinedAtom>(_symbolTable.findGroup(atom.name()));
|
||||
dyn_cast<DefinedAtom>(_symbolTable.findGroup(atom.name()));
|
||||
assert(prevGroup &&
|
||||
"Internal Error: The group atom could only be a defined atom");
|
||||
// The atoms should be of the same content type, reject invalid group
|
||||
|
@ -202,7 +202,7 @@ bool Resolver::maybeAddSectionGroupOrGnuLinkOnce(const DefinedAtom &atom) {
|
|||
for (const Reference *r : atom) {
|
||||
if ((r->kindNamespace() == lld::Reference::KindNamespace::all) &&
|
||||
(r->kindValue() == lld::Reference::kindGroupChild)) {
|
||||
const DefinedAtom *target = llvm::dyn_cast<DefinedAtom>(r->target());
|
||||
const DefinedAtom *target = dyn_cast<DefinedAtom>(r->target());
|
||||
assert(target && "Internal Error: kindGroupChild references need to "
|
||||
"be associated with Defined Atoms only");
|
||||
_atoms.push_back(target);
|
||||
|
|
|
@ -38,7 +38,6 @@
|
|||
#include <map>
|
||||
|
||||
using llvm::StringRef;
|
||||
using llvm::dyn_cast;
|
||||
using llvm::isa;
|
||||
using namespace llvm::MachO;
|
||||
using namespace lld::mach_o::normalized;
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
using llvm::StringRef;
|
||||
using llvm::error_code;
|
||||
using llvm::dyn_cast;
|
||||
using namespace llvm::yaml;
|
||||
using namespace llvm::MachO;
|
||||
using namespace lld::mach_o::normalized;
|
||||
|
|
|
@ -46,8 +46,7 @@ public:
|
|||
if (r->kindNamespace() != lld::Reference::KindNamespace::all)
|
||||
continue;
|
||||
if (r->kindValue() == lld::Reference::kindGroupChild) {
|
||||
const DefinedAtom *target =
|
||||
llvm::dyn_cast<DefinedAtom>(r->target());
|
||||
const DefinedAtom *target = dyn_cast<DefinedAtom>(r->target());
|
||||
assert(target && "Internal Error: kindGroupChild references need "
|
||||
"to be associated with Defined Atoms only");
|
||||
this->addIVarsForDefinedAtom(*target);
|
||||
|
|
|
@ -98,7 +98,7 @@ TEST_F(InputGraphTest, AddAFile) {
|
|||
ErrorOr<InputElement *> nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
FileNode *fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
FileNode *fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
EXPECT_EQ("file1", fileNode->getUserPath());
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_EQ(InputGraphError::no_more_elements, nextElement.getError());
|
||||
|
@ -117,7 +117,7 @@ TEST_F(InputGraphTest, AddAFileWithLLDFiles) {
|
|||
ErrorOr<InputElement *> nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
FileNode *fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
FileNode *fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
|
||||
EXPECT_EQ("multi_files", fileNode->getUserPath());
|
||||
|
||||
|
@ -191,7 +191,7 @@ TEST_F(InputGraphTest, AddNodeWithFilesAndGroup) {
|
|||
ErrorOr<InputElement *> nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
FileNode *fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
FileNode *fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
|
||||
EXPECT_EQ("multi_files1", fileNode->getUserPath());
|
||||
|
||||
|
@ -207,7 +207,7 @@ TEST_F(InputGraphTest, AddNodeWithFilesAndGroup) {
|
|||
EXPECT_EQ(InputGraphError::no_more_files, objfile.getError());
|
||||
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
Group *group = llvm::dyn_cast<Group>(*nextElement);
|
||||
Group *group = dyn_cast<Group>(*nextElement);
|
||||
assert(group);
|
||||
|
||||
objfile = group->getNextFile();
|
||||
|
@ -280,7 +280,7 @@ TEST_F(InputGraphTest, AddNodeWithGroupIteration) {
|
|||
ErrorOr<InputElement *> nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
FileNode *fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
FileNode *fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
|
||||
EXPECT_EQ("multi_files1", fileNode->getUserPath());
|
||||
|
||||
|
@ -296,7 +296,7 @@ TEST_F(InputGraphTest, AddNodeWithGroupIteration) {
|
|||
EXPECT_EQ(InputGraphError::no_more_files, objfile.getError());
|
||||
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
Group *group = llvm::dyn_cast<Group>(*nextElement);
|
||||
Group *group = dyn_cast<Group>(*nextElement);
|
||||
assert(group);
|
||||
|
||||
objfile = group->getNextFile();
|
||||
|
@ -381,25 +381,25 @@ TEST_F(InputGraphTest, ExpandAndReplaceInputGraphNode) {
|
|||
ErrorOr<InputElement *> nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
FileNode *fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
FileNode *fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
EXPECT_EQ("multi_files1", (*fileNode).getUserPath());
|
||||
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
EXPECT_EQ("expand_file1", (*fileNode).getUserPath());
|
||||
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
EXPECT_EQ("expand_file2", (*fileNode).getUserPath());
|
||||
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
EXPECT_NE(InputGraphError::no_more_elements, nextElement.getError());
|
||||
EXPECT_EQ(InputElement::Kind::File, (*nextElement)->kind());
|
||||
fileNode = llvm::dyn_cast<FileNode>(*nextElement);
|
||||
fileNode = dyn_cast<FileNode>(*nextElement);
|
||||
EXPECT_EQ("obj_after_expand", (*fileNode).getUserPath());
|
||||
|
||||
nextElement = inputGraph().getNextInputElement();
|
||||
|
|
Loading…
Reference in New Issue