Skip to content

Comment out compiler builtins #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davispuh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Comment out compiler builtins #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions dstep/translator/MacroDefinition.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ bool translateFunctAlias(
{
import std.algorithm.comparison : equal;
import std.algorithm.iteration : map;
import std.algorithm.searching : startsWith;

CallExpr* expr = definition.expr.peek!CallExpr;
auto expressionContext = ExpressionContext.make(context);
Expand Down Expand Up @@ -554,11 +555,17 @@ bool translateFunctAlias(
.map!(a => a.translate(expressionContext))))
{
version (D1)
enum fmt = "alias %2$s %1$s;";
string fmt = "alias %2$s %1$s;";
else
enum fmt = "alias %1$s = %2$s;";
string fmt = "alias %1$s = %2$s;";

output.singleLine(fmt, definition.spelling, ident.spelling);
// Handle compiler builtins (eg. __builtin_unreachable)
string value = ident.spelling;
if (value.startsWith("__builtin_") || value == "_Alignof")
{
fmt = "// FIXME: " ~ fmt;
}
output.singleLine(fmt, definition.spelling, value);
return true;
}
}
Expand Down Expand Up @@ -592,6 +599,8 @@ void translateMacroDefinitionAliasOrConst(
Context context,
TypedMacroDefinition definition)
{
import std.algorithm.searching : startsWith, canFind;

auto expressionContext = ExpressionContext.make(context);

string formatString;
Expand All @@ -612,10 +621,19 @@ void translateMacroDefinitionAliasOrConst(
formatString = "enum %s = %s;";
}

string value = debraced.translate(expressionContext);
if (["const", "static", "volatile", "_Static_assert"].canFind(value) ||
// Handle compiler builtins
value.startsWith("__builtin_") ||
value.startsWith("__attribute__"))
{
formatString = "// FIXME: " ~ formatString;
}
Comment thread
davispuh marked this conversation as resolved.

output.singleLine(
formatString,
definition.definition.spelling,
debraced.translate(expressionContext));
value);

expressionContext.elevateImports();
}
Expand Down
22 changes: 22 additions & 0 deletions tests/unit/MacroTranslTests.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,3 +841,25 @@ extern (D) auto fun(T)(auto ref T a)
}
D");
}

// Comment out compiler builtins and language keywords.
unittest
{
assertTMD(q"C
#define va_copy __builtin_va_copy
C", q"D
// FIXME: enum va_copy = __builtin_va_copy;
D");

assertTMD(q"C
#define fake _builtin_fake
C", q"D
enum fake = _builtin_fake;
D");

assertTMD(q"C
#define foo(x) __builtin_foo(x)
C", q"D
// FIXME: alias foo = __builtin_foo;
D");
}