diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-31 17:47:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 17:47:02 +0000 |
commit | 81ccda47e8a47f79fdeca9b41ac4a76dbe77ce7c (patch) | |
tree | dd64227b45a2232915eab0dd3b9f6781221c0719 | |
parent | aa34a23ce781467d973e5b15e340fce14d3e6bc9 (diff) | |
parent | d209852846cf49553260d97934fea51db45a1282 (diff) | |
download | slang-81ccda47e8a47f79fdeca9b41ac4a76dbe77ce7c.tar.gz |
Merge "Update language to comply with Android's inclusive language guidance" am: c7da5c24dc am: 82b77f6b7d am: d209852846
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/slang/+/1382856
Change-Id: I223882f09e2cd3b49ef2eee582bcd54ab511bba2
-rw-r--r-- | BitWriter_2_9/BitcodeWriter.cpp | 2 | ||||
-rw-r--r-- | BitWriter_2_9/ValueEnumerator.cpp | 4 | ||||
-rw-r--r-- | BitWriter_2_9_func/BitcodeWriter.cpp | 2 | ||||
-rw-r--r-- | BitWriter_2_9_func/ValueEnumerator.cpp | 4 | ||||
-rw-r--r-- | BitWriter_3_2/BitcodeWriter.cpp | 2 | ||||
-rw-r--r-- | BitWriter_3_2/ValueEnumerator.cpp | 4 | ||||
-rw-r--r-- | slang_rs_context.cpp | 6 | ||||
-rw-r--r-- | slang_rs_export_foreach.h | 2 | ||||
-rw-r--r-- | slang_rs_reflection.cpp | 4 |
9 files changed, 15 insertions, 15 deletions
diff --git a/BitWriter_2_9/BitcodeWriter.cpp b/BitWriter_2_9/BitcodeWriter.cpp index caee7de..8942e47 100644 --- a/BitWriter_2_9/BitcodeWriter.cpp +++ b/BitWriter_2_9/BitcodeWriter.cpp @@ -1698,7 +1698,7 @@ static void EmitDarwinBCHeaderAndTrailer(SmallVectorImpl<char> &Buffer, WriteInt32ToBuffer(BCSize , Buffer, Position); WriteInt32ToBuffer(CPUType , Buffer, Position); - // If the file is not a multiple of 16 bytes, insert dummy padding. + // If the file is not a multiple of 16 bytes, insert placeholder padding. while (Buffer.size() & 15) Buffer.push_back(0); } diff --git a/BitWriter_2_9/ValueEnumerator.cpp b/BitWriter_2_9/ValueEnumerator.cpp index dedbedd..8d6475c 100644 --- a/BitWriter_2_9/ValueEnumerator.cpp +++ b/BitWriter_2_9/ValueEnumerator.cpp @@ -263,7 +263,7 @@ void ValueEnumerator::EnumerateMetadata(const llvm::Metadata *MD) { (isa<MDNode>(MD) || isa<MDString>(MD) || isa<ConstantAsMetadata>(MD)) && "Invalid metadata kind"); - // Insert a dummy ID to block the co-recursive call to + // Insert a placeholder ID to block the co-recursive call to // EnumerateMDNodeOperands() from re-visiting MD in a cyclic graph. // // Return early if there's already an ID. @@ -279,7 +279,7 @@ void ValueEnumerator::EnumerateMetadata(const llvm::Metadata *MD) { HasMDString |= isa<MDString>(MD); HasDILocation |= isa<DILocation>(MD); - // Replace the dummy ID inserted above with the correct one. MDValueMap may + // Replace the placeholder ID inserted above with the correct one. MDValueMap may // have changed by inserting operands, so we need a fresh lookup here. MDs.push_back(MD); MDValueMap[MD] = MDs.size(); diff --git a/BitWriter_2_9_func/BitcodeWriter.cpp b/BitWriter_2_9_func/BitcodeWriter.cpp index 3ed3380..30b8e7d 100644 --- a/BitWriter_2_9_func/BitcodeWriter.cpp +++ b/BitWriter_2_9_func/BitcodeWriter.cpp @@ -1762,7 +1762,7 @@ static void EmitDarwinBCHeaderAndTrailer(SmallVectorImpl<char> &Buffer, WriteInt32ToBuffer(BCSize , Buffer, Position); WriteInt32ToBuffer(CPUType , Buffer, Position); - // If the file is not a multiple of 16 bytes, insert dummy padding. + // If the file is not a multiple of 16 bytes, insert placeholder padding. while (Buffer.size() & 15) Buffer.push_back(0); } diff --git a/BitWriter_2_9_func/ValueEnumerator.cpp b/BitWriter_2_9_func/ValueEnumerator.cpp index ce785da..0690af7 100644 --- a/BitWriter_2_9_func/ValueEnumerator.cpp +++ b/BitWriter_2_9_func/ValueEnumerator.cpp @@ -263,7 +263,7 @@ void ValueEnumerator::EnumerateMetadata(const llvm::Metadata *MD) { (isa<MDNode>(MD) || isa<MDString>(MD) || isa<ConstantAsMetadata>(MD)) && "Invalid metadata kind"); - // Insert a dummy ID to block the co-recursive call to + // Insert a placeholder ID to block the co-recursive call to // EnumerateMDNodeOperands() from re-visiting MD in a cyclic graph. // // Return early if there's already an ID. @@ -279,7 +279,7 @@ void ValueEnumerator::EnumerateMetadata(const llvm::Metadata *MD) { HasMDString |= isa<MDString>(MD); HasDILocation |= isa<DILocation>(MD); - // Replace the dummy ID inserted above with the correct one. MDValueMap may + // Replace the placeholder ID inserted above with the correct one. MDValueMap may // have changed by inserting operands, so we need a fresh lookup here. MDs.push_back(MD); MDValueMap[MD] = MDs.size(); diff --git a/BitWriter_3_2/BitcodeWriter.cpp b/BitWriter_3_2/BitcodeWriter.cpp index c57dd45..2099ac0 100644 --- a/BitWriter_3_2/BitcodeWriter.cpp +++ b/BitWriter_3_2/BitcodeWriter.cpp @@ -1836,7 +1836,7 @@ static void EmitDarwinBCHeaderAndTrailer(SmallVectorImpl<char> &Buffer, WriteInt32ToBuffer(BCSize , Buffer, Position); WriteInt32ToBuffer(CPUType , Buffer, Position); - // If the file is not a multiple of 16 bytes, insert dummy padding. + // If the file is not a multiple of 16 bytes, insert placeholder padding. while (Buffer.size() & 15) Buffer.push_back(0); } diff --git a/BitWriter_3_2/ValueEnumerator.cpp b/BitWriter_3_2/ValueEnumerator.cpp index 4ce2ec6..9d74d75 100644 --- a/BitWriter_3_2/ValueEnumerator.cpp +++ b/BitWriter_3_2/ValueEnumerator.cpp @@ -263,7 +263,7 @@ void ValueEnumerator::EnumerateMetadata(const llvm::Metadata *MD) { (isa<MDNode>(MD) || isa<MDString>(MD) || isa<ConstantAsMetadata>(MD)) && "Invalid metadata kind"); - // Insert a dummy ID to block the co-recursive call to + // Insert a placeholder ID to block the co-recursive call to // EnumerateMDNodeOperands() from re-visiting MD in a cyclic graph. // // Return early if there's already an ID. @@ -279,7 +279,7 @@ void ValueEnumerator::EnumerateMetadata(const llvm::Metadata *MD) { HasMDString |= isa<MDString>(MD); HasDILocation |= isa<DILocation>(MD); - // Replace the dummy ID inserted above with the correct one. MDValueMap may + // Replace the placeholder ID inserted above with the correct one. MDValueMap may // have changed by inserting operands, so we need a fresh lookup here. MDs.push_back(MD); MDValueMap[MD] = MDs.size(); diff --git a/slang_rs_context.cpp b/slang_rs_context.cpp index b2c3179..ed2c47e 100644 --- a/slang_rs_context.cpp +++ b/slang_rs_context.cpp @@ -276,7 +276,7 @@ bool RSContext::processExports() { } } - // Create a dummy root in slot 0 if a root kernel is not seen + // Create a placeholder root in slot 0 if a root kernel is not seen // and there exists a non-root kernel. if (valid && mExportForEach[0] == nullptr) { const size_t numExportedForEach = mExportForEach.size(); @@ -302,7 +302,7 @@ bool RSContext::processExports() { } bool RSContext::processReducePragmas(Backend *BE) { - // This is needed to ensure that the dummy variable is emitted into + // This is needed to ensure that the placeholder variable is emitted into // the bitcode -- which in turn forces the function to be emitted // into the bitcode. We couldn't do this at // markUsedByReducePragma() time because we had to wait until the @@ -346,7 +346,7 @@ void RSContext::markUsedByReducePragma(clang::FunctionDecl *FD, CheckName Check) // reduce). FD->setIsUsed(); - // Each constituent function "f" of a reduction kernel gets a dummy variable generated for it: + // Each constituent function "f" of a reduction kernel gets a placeholder variable generated for it: // void *.rs.reduce_fn.f = (void*)&f; // This is a trick to ensure that clang will not delete "f" as unused. diff --git a/slang_rs_export_foreach.h b/slang_rs_export_foreach.h index 4622e24..d5928f5 100644 --- a/slang_rs_export_foreach.h +++ b/slang_rs_export_foreach.h @@ -48,7 +48,7 @@ class RSExportForEach : public RSExportable { std::string mName; // For diagnostic purposes, we record the order in which we parse - // foreach kernels. Does not apply to a dummy root. + // foreach kernels. Does not apply to a placeholder root. unsigned mOrdinal; RSExportRecordType *mParamPacketType; diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp index 2c30e4f..875d84b 100644 --- a/slang_rs_reflection.cpp +++ b/slang_rs_reflection.cpp @@ -1005,7 +1005,7 @@ void RSReflectionJava::genExportForEach(const RSExportForEach *EF) { mState->declareForEachDummyRoot(EF); if (!mCollecting) { - // Skip reflection for dummy root() kernels. Note that we have to + // Skip reflection for placeholder root() kernels. Note that we have to // advance the next slot number for ForEach, however. mOut.indent() << "//private final static int " << RS_EXPORT_FOREACH_INDEX_PREFIX << EF->getName() << " = " @@ -1498,7 +1498,7 @@ void RSReflectionJava::genExportReduceAllocationVariant(const RSExportReduce *ER mOut.indent() << "// " << InComment << "\n"; startFunction(AM_Public, false, ResultTypeName.c_str(), MethodName, Args); const std::string &In0Name = Args[0].second; - // Sanity-check inputs + // Validity-check inputs if (Ins.size() > 1) mOut.indent() << "Type t0, t1;\n"; for (size_t InIdx = 0, InEnd = Ins.size(); InIdx < InEnd; ++InIdx) { |