MSVC 2013 can't even parse __declspec(align(sizeof(foo))). We'll have to
wait until MSVC 2015 for this.
This partially reverts commit r233911.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@233912
91177308-0d34-0410-b5e6-
96231b3b80d8
#ifndef LLVM_CLANG_AST_DECLGROUP_H
#define LLVM_CLANG_AST_DECLGROUP_H
-#include "llvm/Support/Compiler.h"
#include "llvm/Support/DataTypes.h"
#include <cassert>
class DeclGroup;
class DeclGroupIterator;
-class LLVM_ALIGNAS(sizeof(void *)) DeclGroup {
+class DeclGroup {
// FIXME: Include a TypeSpecifier object.
- unsigned NumDecls;
+ union {
+ unsigned NumDecls;
+
+ Decl *Aligner;
+ };
private:
DeclGroup() : NumDecls(0) {}
/// friend void foo<>(T);
/// };
/// \endcode
-class LLVM_ALIGNAS(sizeof(void *)) DependentFunctionTemplateSpecializationInfo {
- /// The number of potential template candidates.
- unsigned NumTemplates;
+class DependentFunctionTemplateSpecializationInfo {
+ struct CA {
+ /// The number of potential template candidates.
+ unsigned NumTemplates;
- /// The number of template arguments.
- unsigned NumArgs;
+ /// The number of template arguments.
+ unsigned NumArgs;
+ };
+
+ union {
+ // Force sizeof to be a multiple of sizeof(void*) so that the
+ // trailing data is aligned.
+ void *Aligner;
+ struct CA d;
+ };
/// The locations of the left and right angle brackets.
SourceRange AngleLocs;
/// \brief Returns the number of function templates that this might
/// be a specialization of.
- unsigned getNumTemplates() const { return NumTemplates; }
+ unsigned getNumTemplates() const {
+ return d.NumTemplates;
+ }
/// \brief Returns the i'th template candidate.
FunctionTemplateDecl *getTemplate(unsigned I) const {
}
/// \brief Returns the number of explicit template arguments that were given.
- unsigned getNumTemplateArgs() const { return NumArgs; }
+ unsigned getNumTemplateArgs() const {
+ return d.NumArgs;
+ }
/// \brief Returns the nth template argument.
const TemplateArgumentLoc &getTemplateArg(unsigned I) const {
/// Stmt - This represents one statement.
///
-class LLVM_ALIGNAS(sizeof(void *)) Stmt {
+class Stmt {
public:
enum StmtClass {
NoStmtClass = 0,
};
union {
+ // FIXME: this is wasteful on 64-bit platforms.
+ void *Aligner;
+
StmtBitfields StmtBits;
CompoundStmtBitfields CompoundStmtBits;
ExprBitfields ExprBits;
DependentFunctionTemplateSpecializationInfo::
DependentFunctionTemplateSpecializationInfo(const UnresolvedSetImpl &Ts,
const TemplateArgumentListInfo &TArgs)
- : NumTemplates(Ts.size()), NumArgs(TArgs.size()),
- AngleLocs(TArgs.getLAngleLoc(), TArgs.getRAngleLoc()) {
+ : AngleLocs(TArgs.getLAngleLoc(), TArgs.getRAngleLoc()) {
static_assert(sizeof(*this) % llvm::AlignOf<void *>::Alignment == 0,
"Trailing data is unaligned!");
+ d.NumTemplates = Ts.size();
+ d.NumArgs = TArgs.size();
+
FunctionTemplateDecl **TsArray =
const_cast<FunctionTemplateDecl**>(getTemplates());
for (unsigned I = 0, E = Ts.size(); I != E; ++I)