diff options
| -rw-r--r-- | slang_rs_check_ast.cpp | 2 | ||||
| -rw-r--r-- | slang_rs_context.cpp | 4 | ||||
| -rw-r--r-- | slang_rs_export_type.cpp | 5 | ||||
| -rw-r--r-- | slang_utils.cpp | 2 | ||||
| -rw-r--r-- | tests/F_no_java_package_name/stderr.txt.expect | 2 | ||||
| -rw-r--r-- | tests/F_no_pragma/stderr.txt.expect | 2 | ||||
| -rw-r--r-- | tests/F_no_version_pragma/stderr.txt.expect | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/slang_rs_check_ast.cpp b/slang_rs_check_ast.cpp index 72b97a7..845db4c 100644 --- a/slang_rs_check_ast.cpp +++ b/slang_rs_check_ast.cpp @@ -82,7 +82,7 @@ void RSCheckAST::ValidateVarDecl(clang::VarDecl *VD) { clang::QualType QT = VD->getType(); - if (VD->getLinkage() == clang::ExternalLinkage) { + if (VD->getFormalLinkage() == clang::ExternalLinkage) { llvm::StringRef TypeName; const clang::Type *T = QT.getTypePtr(); if (!RSExportType::NormalizeType(T, TypeName, &mDiagEngine, VD)) { diff --git a/slang_rs_context.cpp b/slang_rs_context.cpp index 84c7181..7ed387e 100644 --- a/slang_rs_context.cpp +++ b/slang_rs_context.cpp @@ -234,7 +234,7 @@ bool RSContext::processExport() { DI++) { if (DI->getKind() == clang::Decl::Var) { clang::VarDecl *VD = (clang::VarDecl*) (*DI); - if (VD->getLinkage() == clang::ExternalLinkage) { + if (VD->getFormalLinkage() == clang::ExternalLinkage) { if (!processExportVar(VD)) { valid = false; } @@ -242,7 +242,7 @@ bool RSContext::processExport() { } else if (DI->getKind() == clang::Decl::Function) { // Export functions clang::FunctionDecl *FD = (clang::FunctionDecl*) (*DI); - if (FD->getLinkage() == clang::ExternalLinkage) { + if (FD->getFormalLinkage() == clang::ExternalLinkage) { if (!processExportFunc(FD)) { valid = false; } diff --git a/slang_rs_export_type.cpp b/slang_rs_export_type.cpp index e7e5b0d..771d821 100644 --- a/slang_rs_export_type.cpp +++ b/slang_rs_export_type.cpp @@ -335,7 +335,8 @@ static bool ValidateRSObjectInVarDecl(clang::VarDecl *VD, // Only if we are already in a composite type (like an array or structure). if (InCompositeType) { // Only if we are actually exported (i.e. non-static). - if (VD->hasLinkage() && (VD->getLinkage() == clang::ExternalLinkage)) { + if (VD->hasLinkage() && + (VD->getFormalLinkage() == clang::ExternalLinkage)) { // Only if we are not a pointer to an object. const clang::Type *T = GET_CANONICAL_TYPE(VD->getType().getTypePtr()); if (T->getTypeClass() != clang::Type::Pointer) { @@ -512,7 +513,7 @@ static bool ValidateTypeHelper( InCompositeType && EVT->getNumElements() == 3 && ND && - ND->getLinkage() == clang::ExternalLinkage) { + ND->getFormalLinkage() == clang::ExternalLinkage) { ReportTypeError(&C.getDiagnostics(), ND, NULL, "structs containing vectors of dimension 3 cannot " "be exported at this API level: '%0'"); diff --git a/slang_utils.cpp b/slang_utils.cpp index 342496f..9506cef 100644 --- a/slang_utils.cpp +++ b/slang_utils.cpp @@ -18,7 +18,7 @@ #include <string> -#include "llvm/Support/Path.h" +#include "llvm/Support/PathV1.h" namespace slang { diff --git a/tests/F_no_java_package_name/stderr.txt.expect b/tests/F_no_java_package_name/stderr.txt.expect index cbf8c5f..c554bc6 100644 --- a/tests/F_no_java_package_name/stderr.txt.expect +++ b/tests/F_no_java_package_name/stderr.txt.expect @@ -1 +1 @@ -no_java_package_name.rs:6:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file +no_java_package_name.rs:7:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file diff --git a/tests/F_no_pragma/stderr.txt.expect b/tests/F_no_pragma/stderr.txt.expect index 8b4c80e..87440ca 100644 --- a/tests/F_no_pragma/stderr.txt.expect +++ b/tests/F_no_pragma/stderr.txt.expect @@ -1 +1 @@ -second.rs:2:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file +second.rs:3:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file diff --git a/tests/F_no_version_pragma/stderr.txt.expect b/tests/F_no_version_pragma/stderr.txt.expect index e326847..d7c30b8 100644 --- a/tests/F_no_version_pragma/stderr.txt.expect +++ b/tests/F_no_version_pragma/stderr.txt.expect @@ -1 +1 @@ -no_version_pragma.rs:7:1: error: missing pragma for version in source file +no_version_pragma.rs:8:1: error: missing pragma for version in source file |