Hash :
8e9dc1a6
Author :
Date :
2024-11-19T11:08:31
Validate anonymous struct names with namespace
Consider GLSL:
struct { vec4 e; } g;
struct sbbf { vec4 f; };
The struct name validation would fail if user chosen struct name would
clash with a symbol name that ANGLE internally gave to an anonymous
struct.
Fix by importing Name abstraction from MSL backend. A symbol name is
a pair (namespace, string).
Move operator<<(std::ostream &os, const ImmutableString &str)
to sh namespace because that is more natural for operator overloading
name resolution. MSVC works with this.
Bug: angleproject:379758201
Change-Id: Icc9b02aa8cb532e1d925e2fba4c45468f01b9144
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6035029
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Auto-Submit: Kimmo Kinnunen <kkinnunen@apple.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Kimmo Kinnunen <kkinnunen@apple.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
//
// Copyright 2020 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "compiler/translator/Name.h"
#include "common/debug.h"
#include "compiler/translator/tree_util/IntermTraverse.h"
namespace sh
{
////////////////////////////////////////////////////////////////////////////////
template <typename T>
static ImmutableString GetName(T const &object)
{
if (object.symbolType() == SymbolType::Empty)
{
return kEmptyImmutableString;
}
return object.name();
}
Name::Name(const TField &field) : Name(GetName(field), field.symbolType()) {}
Name::Name(const TSymbol &symbol) : Name(GetName(symbol), symbol.symbolType()) {}
bool Name::operator==(const Name &other) const
{
return mRawName == other.mRawName && mSymbolType == other.mSymbolType;
}
bool Name::operator!=(const Name &other) const
{
return !(*this == other);
}
bool Name::operator<(const Name &other) const
{
if (mRawName < other.mRawName)
{
return true;
}
if (other.mRawName < mRawName)
{
return false;
}
return mSymbolType < other.mSymbolType;
}
bool Name::empty() const
{
return mSymbolType == SymbolType::Empty;
}
bool Name::beginsWith(const Name &prefix) const
{
if (mSymbolType != prefix.mSymbolType)
{
return false;
}
return mRawName.beginsWith(prefix.mRawName);
}
void Name::emit(TInfoSinkBase &out) const
{
emitImpl(out);
}
template <typename T>
void Name::emitImpl(T &out) const
{
switch (mSymbolType)
{
case SymbolType::BuiltIn:
ASSERT(!mRawName.empty());
out << mRawName;
break;
case SymbolType::UserDefined:
ASSERT(!mRawName.empty());
if (mRawName != "main")
{
out << kUserDefinedNamePrefix << mRawName;
}
else
{
out << mRawName;
}
break;
case SymbolType::AngleInternal:
ASSERT(!mRawName.empty());
if (mRawName.beginsWith(kAngleInternalPrefix))
{
out << mRawName;
}
else
{
out << kAngleInternalPrefix << '_' << mRawName;
}
break;
case SymbolType::Empty:
UNREACHABLE();
break;
}
}
std::ostream &operator<<(std::ostream &out, const Name &name)
{
name.emitImpl(out);
return out;
}
////////////////////////////////////////////////////////////////////////////////
namespace
{
// NOTE: This matches more things than FindSymbolNode.
class ExpressionContainsNameVisitor : public TIntermTraverser
{
Name mName;
bool mFoundName = false;
public:
ExpressionContainsNameVisitor(const Name &name)
: TIntermTraverser(true, false, false), mName(name)
{}
bool foundName() const { return mFoundName; }
void visitSymbol(TIntermSymbol *node) override
{
if (Name(node->variable()) == mName)
{
mFoundName = true;
}
}
bool visitSwizzle(Visit, TIntermSwizzle *) override { return !mFoundName; }
bool visitBinary(Visit visit, TIntermBinary *node) override { return !mFoundName; }
bool visitUnary(Visit visit, TIntermUnary *node) override { return !mFoundName; }
bool visitTernary(Visit visit, TIntermTernary *node) override { return !mFoundName; }
bool visitAggregate(Visit visit, TIntermAggregate *node) override
{
if (node->isConstructor())
{
const TType &type = node->getType();
const TStructure *structure = type.getStruct();
if (structure && Name(*structure) == mName)
{
mFoundName = true;
}
}
else
{
const TFunction *func = node->getFunction();
if (func && Name(*func) == mName)
{
mFoundName = true;
}
}
return !mFoundName;
}
bool visitIfElse(Visit visit, TIntermIfElse *node) override
{
UNREACHABLE();
return false;
}
bool visitSwitch(Visit, TIntermSwitch *) override
{
UNREACHABLE();
return false;
}
bool visitCase(Visit, TIntermCase *) override
{
UNREACHABLE();
return false;
}
void visitFunctionPrototype(TIntermFunctionPrototype *) override { UNREACHABLE(); }
bool visitFunctionDefinition(Visit, TIntermFunctionDefinition *) override
{
UNREACHABLE();
return false;
}
bool visitBlock(Visit, TIntermBlock *) override
{
UNREACHABLE();
return false;
}
bool visitGlobalQualifierDeclaration(Visit, TIntermGlobalQualifierDeclaration *) override
{
UNREACHABLE();
return false;
}
bool visitDeclaration(Visit, TIntermDeclaration *) override
{
UNREACHABLE();
return false;
}
bool visitLoop(Visit, TIntermLoop *) override
{
UNREACHABLE();
return false;
}
bool visitBranch(Visit, TIntermBranch *) override
{
UNREACHABLE();
return false;
}
void visitPreprocessorDirective(TIntermPreprocessorDirective *) override { UNREACHABLE(); }
};
} // anonymous namespace
bool ExpressionContainsName(const Name &name, TIntermTyped &node)
{
ExpressionContainsNameVisitor visitor(name);
node.traverse(&visitor);
return visitor.foundName();
}
} // namespace sh