aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-25 15:06:36 +0000
committerNarayan Kamath <narayan@google.com>2014-03-25 15:12:05 +0000
commit50cab07b24f9d85899e697cac88a05cb8347fe74 (patch)
tree8efc6172dccd94d653e30403f570abd9ca9a4c49
parent48a489496dd0f7cb861ce30e43124811c478da54 (diff)
downloadandroid_frameworks_compile_slang-50cab07b24f9d85899e697cac88a05cb8347fe74.tar.gz
android_frameworks_compile_slang-50cab07b24f9d85899e697cac88a05cb8347fe74.tar.bz2
android_frameworks_compile_slang-50cab07b24f9d85899e697cac88a05cb8347fe74.zip
Fix clang compile errors.
Clean up several unnecessary forward declarations and private member variables. Change-Id: I5cd27a82ae222b8ee589cd279d8778ef7061a531
-rw-r--r--slang_backend.h2
-rw-r--r--slang_rs_backend.h1
-rw-r--r--slang_rs_context.cpp1
-rw-r--r--slang_rs_context.h1
-rw-r--r--slang_rs_export_foreach.h6
5 files changed, 2 insertions, 9 deletions
diff --git a/slang_backend.h b/slang_backend.h
index 69721fe..d34dc60 100644
--- a/slang_backend.h
+++ b/slang_backend.h
@@ -32,8 +32,6 @@ namespace llvm {
class LLVMContext;
class NamedMDNode;
class Module;
- class PassManager;
- class FunctionPassManager;
}
namespace clang {
diff --git a/slang_rs_backend.h b/slang_rs_backend.h
index 2d6ab72..a8fef0e 100644
--- a/slang_rs_backend.h
+++ b/slang_rs_backend.h
@@ -55,7 +55,6 @@ class RSBackend : public Backend {
llvm::NamedMDNode *mExportForEachNameMetadata;
llvm::NamedMDNode *mExportForEachSignatureMetadata;
llvm::NamedMDNode *mExportTypeMetadata;
- llvm::NamedMDNode *mExportElementMetadata;
llvm::NamedMDNode *mRSObjectSlotsMetadata;
RSObjectRefCount mRefCount;
diff --git a/slang_rs_context.cpp b/slang_rs_context.cpp
index 2229e32..c1c27f4 100644
--- a/slang_rs_context.cpp
+++ b/slang_rs_context.cpp
@@ -50,7 +50,6 @@ RSContext::RSContext(clang::Preprocessor &PP,
std::vector<std::string> *GeneratedFileNames)
: mPP(PP),
mCtx(Ctx),
- mTarget(Target),
mPragmas(Pragmas),
mTargetAPI(TargetAPI),
mGeneratedFileNames(GeneratedFileNames),
diff --git a/slang_rs_context.h b/slang_rs_context.h
index 6722a57..4a9261e 100644
--- a/slang_rs_context.h
+++ b/slang_rs_context.h
@@ -66,7 +66,6 @@ class RSContext {
private:
clang::Preprocessor &mPP;
clang::ASTContext &mCtx;
- const clang::TargetInfo &mTarget;
PragmaList *mPragmas;
unsigned int mTargetAPI;
std::vector<std::string> *mGeneratedFileNames;
diff --git a/slang_rs_export_foreach.h b/slang_rs_export_foreach.h
index be5db92..ec307d2 100644
--- a/slang_rs_export_foreach.h
+++ b/slang_rs_export_foreach.h
@@ -50,8 +50,6 @@ class RSExportForEach : public RSExportable {
const clang::ParmVarDecl *mUsrData;
const clang::ParmVarDecl *mX;
const clang::ParmVarDecl *mY;
- const clang::ParmVarDecl *mZ;
- const clang::ParmVarDecl *mAr;
clang::QualType mResultType; // return type (if present).
bool mHasReturnType; // does this kernel have a return type?
@@ -64,8 +62,8 @@ class RSExportForEach : public RSExportable {
: RSExportable(Context, RSExportable::EX_FOREACH),
mName(Name.data(), Name.size()), mParamPacketType(NULL), mInType(NULL),
mOutType(NULL), numParams(0), mSignatureMetadata(0),
- mIn(NULL), mOut(NULL), mUsrData(NULL), mX(NULL), mY(NULL), mZ(NULL),
- mAr(NULL), mResultType(clang::QualType()), mHasReturnType(false),
+ mIn(NULL), mOut(NULL), mUsrData(NULL), mX(NULL), mY(NULL),
+ mResultType(clang::QualType()), mHasReturnType(false),
mIsKernelStyle(false), mDummyRoot(false) {
return;
}