Skip to content

Commit 025d256

Browse files
mralephcommit-bot@chromium.org
authored andcommitted
Remove divisive terms
Based on guidance in https://developers.google.com/style/ Related to #42247 Change-Id: Iaf37f3372b2b5882738cfa63339dd7b032cdbba9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150630 Commit-Queue: Vyacheslav Egorov <[email protected]> Reviewed-by: Martin Kustermann <[email protected]>
1 parent 72f65f7 commit 025d256

File tree

8 files changed

+35
-34
lines changed

8 files changed

+35
-34
lines changed

runtime/vm/compiler/backend/il_test_helper.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ FlowGraph* TestPipeline::RunPasses(
126126
BlockScheduler::AssignEdgeWeights(flow_graph_);
127127
}
128128

129-
SpeculativeInliningPolicy speculative_policy(/*enable_blacklist=*/false);
129+
SpeculativeInliningPolicy speculative_policy(/*enable_suppression=*/false);
130130
pass_state_ = new CompilerPassState(thread, flow_graph_, &speculative_policy);
131131
pass_state_->reorder_blocks = reorder_blocks;
132132

@@ -163,7 +163,7 @@ void TestPipeline::CompileGraphAndAttachFunction() {
163163
Zone* zone = thread_->zone();
164164
const bool optimized = true;
165165

166-
SpeculativeInliningPolicy speculative_policy(/*enable_blacklist=*/false);
166+
SpeculativeInliningPolicy speculative_policy(/*enable_suppression=*/false);
167167

168168
#if defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_IA32)
169169
const bool use_far_branches = false;

runtime/vm/compiler/backend/inliner.h

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,22 @@ class TargetEntryInstr;
3131

3232
class SpeculativeInliningPolicy {
3333
public:
34-
explicit SpeculativeInliningPolicy(bool enable_blacklist, intptr_t limit = -1)
35-
: enable_blacklist_(enable_blacklist), remaining_(limit) {}
34+
explicit SpeculativeInliningPolicy(bool enable_suppression,
35+
intptr_t limit = -1)
36+
: enable_suppression_(enable_suppression), remaining_(limit) {}
3637

3738
bool AllowsSpeculativeInlining() const {
38-
return !enable_blacklist_ || remaining_ > 0;
39+
return !enable_suppression_ || remaining_ > 0;
3940
}
4041

4142
bool IsAllowedForInlining(intptr_t call_deopt_id) const {
42-
// If we are not blacklisting, we always enable optimistic inlining.
43-
if (!enable_blacklist_) {
43+
// If we are not supressing, we always enable optimistic inlining.
44+
if (!enable_suppression_) {
4445
return true;
4546
}
4647

47-
// If we have already blacklisted the deopt-id we don't allow inlining it.
48-
if (IsBlacklisted(call_deopt_id)) {
48+
// If we have already suppressed the deopt-id we don't allow inlining it.
49+
if (IsSuppressed(call_deopt_id)) {
4950
return false;
5051
}
5152

@@ -54,37 +55,37 @@ class SpeculativeInliningPolicy {
5455
}
5556

5657
bool AddBlockedDeoptId(intptr_t id) {
57-
ASSERT(enable_blacklist_);
58+
ASSERT(enable_suppression_);
5859
#if defined(DEBUG)
59-
ASSERT(!IsBlacklisted(id));
60+
ASSERT(!IsSuppressed(id));
6061
#endif
6162

62-
// If we exhausted the number of blacklist entries there is no point
63-
// in adding entries to the blacklist.
63+
// If we exhausted the number of suppression entries there is no point
64+
// in adding entries to the list.
6465
if (remaining_ <= 0) return false;
6566

66-
inlining_blacklist_.Add(id);
67+
inlining_suppressions_.Add(id);
6768
remaining_ -= 1;
6869
return true;
6970
}
7071

71-
intptr_t length() const { return inlining_blacklist_.length(); }
72+
intptr_t length() const { return inlining_suppressions_.length(); }
7273

7374
private:
74-
bool IsBlacklisted(intptr_t id) const {
75-
for (intptr_t i = 0; i < inlining_blacklist_.length(); ++i) {
76-
if (inlining_blacklist_[i] == id) return true;
75+
bool IsSuppressed(intptr_t id) const {
76+
for (intptr_t i = 0; i < inlining_suppressions_.length(); ++i) {
77+
if (inlining_suppressions_[i] == id) return true;
7778
}
7879
return false;
7980
}
8081

81-
// Whether we enable blacklisting deopt-ids.
82-
const bool enable_blacklist_;
82+
// Whether we enable supressing inlining at specific deopt-ids.
83+
const bool enable_suppression_;
8384

84-
// After we reach [remaining_] number of deopt-ids in [inlining_blacklist_]
85-
// in the black list, we'll disable speculative inlining entirely.
85+
// After we reach [remaining_] number of deopt-ids in [inlining_suppressions_]
86+
// list, we'll disable speculative inlining entirely.
8687
intptr_t remaining_;
87-
GrowableArray<intptr_t> inlining_blacklist_;
88+
GrowableArray<intptr_t> inlining_suppressions_;
8889
};
8990

9091
class FlowGraphInliner : ValueObject {

runtime/vm/compiler/jit/compiler.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,8 @@ CodePtr CompileParsedFunctionHelper::Compile(CompilationPipeline* pipeline) {
521521
volatile bool use_far_branches = false;
522522

523523
// In the JIT case we allow speculative inlining and have no need for a
524-
// blacklist, since we don't restart optimization.
525-
SpeculativeInliningPolicy speculative_policy(/* enable_blacklist= */ false);
524+
// suppression, since we don't restart optimization.
525+
SpeculativeInliningPolicy speculative_policy(/*enable_suppression=*/false);
526526

527527
Code* volatile result = &Code::ZoneHandle(zone);
528528
while (!done) {

runtime/vm/isolate.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,8 +1299,8 @@ MessageHandler::MessageStatus IsolateMessageHandler::HandleMessage(
12991299
} else {
13001300
#ifndef PRODUCT
13011301
if (!Isolate::IsVMInternalIsolate(I)) {
1302-
// Mark all the user isolates as white-listed for the simplified timeline
1303-
// page of Observatory. The internal isolates will be filtered out from
1302+
// Mark all the user isolates as using a simplified timeline page of
1303+
// Observatory. The internal isolates will be filtered out from
13041304
// the Timeline due to absence of this argument. We still send them in
13051305
// order to maintain the original behavior of the full timeline and allow
13061306
// the developer to download complete dump files.

runtime/vm/raw_object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ class NamespaceLayout : public ObjectLayout {
13501350
VISIT_FROM(ObjectPtr, library_);
13511351
LibraryPtr library_; // library with name dictionary.
13521352
ArrayPtr show_names_; // list of names that are exported.
1353-
ArrayPtr hide_names_; // blacklist of names that are not exported.
1353+
ArrayPtr hide_names_; // list of names that are hidden.
13541354
FieldPtr metadata_field_; // remembers the token pos of metadata if any,
13551355
// and the metadata values if computed.
13561356
VISIT_TO(ObjectPtr, metadata_field_);

runtime/vm/regexp_parser.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ bool LookupSpecialPropertyValueName(const char* name,
15461546
return true;
15471547
}
15481548

1549-
// Explicitly whitelist supported binary properties. The spec forbids supporting
1549+
// Explicitly list supported binary properties. The spec forbids supporting
15501550
// properties outside of this set to ensure interoperability.
15511551
bool IsSupportedBinaryProperty(UProperty property) {
15521552
switch (property) {

runtime/vm/scopes.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class LocalVariable : public ZoneAllocated {
124124
// Variables marked as forced to stack are skipped and not captured by
125125
// CaptureLocalVariables - which iterates scope chain between two scopes
126126
// and indiscriminately marks all variables as captured.
127-
// TODO(27590) remove the hardcoded blacklist from CaptureLocalVariables
127+
// TODO(27590) remove the hardcoded list of names from CaptureLocalVariables
128128
bool is_forced_stack() const { return is_forced_stack_; }
129129
void set_is_forced_stack() { is_forced_stack_ = true; }
130130

@@ -499,9 +499,9 @@ class LocalScope : public ZoneAllocated {
499499
LocalScope* parent_;
500500
LocalScope* child_;
501501
LocalScope* sibling_;
502-
int function_level_; // Reflects the nesting level of local functions.
503-
int loop_level_; // Reflects the loop nesting level.
504-
int context_level_; // Reflects the level of the runtime context.
502+
int function_level_; // Reflects the nesting level of local functions.
503+
int loop_level_; // Reflects the loop nesting level.
504+
int context_level_; // Reflects the level of the runtime context.
505505
TokenPosition begin_token_pos_; // Token index of beginning of scope.
506506
TokenPosition end_token_pos_; // Token index of end of scope.
507507
GrowableArray<LocalVariable*> variables_;

runtime/vm/type_testing_stubs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class TypeTestingStubNamer {
3838

3939
class TypeTestingStubGenerator {
4040
public:
41-
// During bootstrapping it will return `null` for a whitelisted set of types,
41+
// During bootstrapping it will return `null` for |void| and |dynamic| types,
4242
// otherwise it will return a default stub which tail-calls
4343
// subtypingtest/runtime code.
4444
static CodePtr DefaultCodeForType(const AbstractType& type,

0 commit comments

Comments
 (0)