X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mcs%2Fmcs%2Fcodegen.cs;h=4a7835b617d3a49734997a00e9521969c5cc4328;hb=6b29e29967bb5dffd3768b7eec30dcea8cf1c8bd;hp=a5bfe97a834908bb1c9e55b9ce7b956e73f8db4e;hpb=f8be5461467b13a0423adc77b4f0ad897537d532;p=mono.git
diff --git a/mcs/mcs/codegen.cs b/mcs/mcs/codegen.cs
index a5bfe97a834..4a7835b617d 100644
--- a/mcs/mcs/codegen.cs
+++ b/mcs/mcs/codegen.cs
@@ -19,8 +19,7 @@
using System;
using System.IO;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Generic;
using System.Globalization;
using System.Reflection;
using System.Reflection.Emit;
@@ -80,32 +79,25 @@ namespace Mono.CSharp {
}
static public string FileName;
-
-#if MS_COMPATIBLE
- const AssemblyBuilderAccess COMPILER_ACCESS = 0;
-#else
- /* Keep this in sync with System.Reflection.Emit.AssemblyBuilder */
- const AssemblyBuilderAccess COMPILER_ACCESS = (AssemblyBuilderAccess) 0x800;
-#endif
//
// Initializes the code generator variables for interactive use (repl)
//
- static public void InitDynamic (string name)
+ static public void InitDynamic (CompilerContext ctx, string name)
{
current_domain = AppDomain.CurrentDomain;
AssemblyName an = Assembly.GetAssemblyName (name, name);
- Assembly.Builder = current_domain.DefineDynamicAssembly (an, AssemblyBuilderAccess.Run | COMPILER_ACCESS);
- RootContext.ToplevelTypes = new ModuleContainer (true);
+ Assembly.Builder = current_domain.DefineDynamicAssembly (an, AssemblyBuilderAccess.Run);
+ RootContext.ToplevelTypes = new ModuleCompiled (ctx, true);
RootContext.ToplevelTypes.Builder = Assembly.Builder.DefineDynamicModule (Basename (name), false);
Assembly.Name = Assembly.Builder.GetName ();
}
-
+
//
// Initializes the code generator variables
//
- static public bool Init (string name, string output, bool want_debugging_support)
+ static public bool Init (string name, string output, bool want_debugging_support, CompilerContext ctx)
{
FileName = output;
AssemblyName an = Assembly.GetAssemblyName (name, output);
@@ -119,7 +111,7 @@ namespace Mono.CSharp {
AssemblyName ref_name = a.GetName ();
byte [] b = ref_name.GetPublicKeyToken ();
if (b == null || b.Length == 0) {
- Report.Error (1577, "Assembly generation failed " +
+ ctx.Report.Error (1577, "Assembly generation failed " +
"-- Referenced assembly '" +
ref_name.Name +
"' does not have a strong name.");
@@ -132,12 +124,12 @@ namespace Mono.CSharp {
try {
Assembly.Builder = current_domain.DefineDynamicAssembly (an,
- AssemblyBuilderAccess.RunAndSave | COMPILER_ACCESS, Dirname (name));
+ AssemblyBuilderAccess.RunAndSave, Dirname (name));
}
catch (ArgumentException) {
// specified key may not be exportable outside it's container
if (RootContext.StrongNameKeyContainer != null) {
- Report.Error (1548, "Could not access the key inside the container `" +
+ ctx.Report.Error (1548, "Could not access the key inside the container `" +
RootContext.StrongNameKeyContainer + "'.");
Environment.Exit (1);
}
@@ -145,7 +137,7 @@ namespace Mono.CSharp {
}
catch (CryptographicException) {
if ((RootContext.StrongNameKeyContainer != null) || (RootContext.StrongNameKeyFile != null)) {
- Report.Error (1548, "Could not use the specified key to strongname the assembly.");
+ ctx.Report.Error (1548, "Could not use the specified key to strongname the assembly.");
Environment.Exit (1);
}
return false;
@@ -170,13 +162,13 @@ namespace Mono.CSharp {
#if !MS_COMPATIBLE
// TODO: We should use SymbolWriter from DefineDynamicModule
if (want_debugging_support && !SymbolWriter.Initialize (RootContext.ToplevelTypes.Builder, output)) {
- Report.Error (40, "Unexpected debug information initialization error `{0}'",
+ ctx.Report.Error (40, "Unexpected debug information initialization error `{0}'",
"Could not find the symbol writer assembly (Mono.CompilerServices.SymbolWriter.dll)");
return false;
}
#endif
} catch (ExecutionEngineException e) {
- Report.Error (40, "Unexpected debug information initialization error `{0}'",
+ ctx.Report.Error (40, "Unexpected debug information initialization error `{0}'",
e.Message);
return false;
}
@@ -184,9 +176,8 @@ namespace Mono.CSharp {
return true;
}
- static public void Save (string name, bool saveDebugInfo)
+ static public void Save (string name, bool saveDebugInfo, Report Report)
{
-#if GMCS_SOURCE
PortableExecutableKinds pekind;
ImageFileMachine machine;
@@ -209,13 +200,8 @@ namespace Mono.CSharp {
machine = ImageFileMachine.I386;
break;
}
-#endif
try {
-#if GMCS_SOURCE
Assembly.Builder.Save (Basename (name), pekind, machine);
-#else
- Assembly.Builder.Save (Basename (name));
-#endif
}
catch (COMException) {
if ((RootContext.StrongNameKeyFile == null) || (!RootContext.StrongNameDelaySign))
@@ -247,149 +233,32 @@ namespace Mono.CSharp {
}
}
-
- ///
- /// An interface to hold all the information needed in the resolving phase.
- ///
- public interface IResolveContext
- {
- DeclSpace DeclContainer { get; }
- bool IsInObsoleteScope { get; }
- bool IsInUnsafeScope { get; }
-
- // the declcontainer to lookup for type-parameters. Should only use LookupGeneric on it.
- //
- // FIXME: This is somewhat of a hack. We don't need a full DeclSpace for this. We just need the
- // current type parameters in scope. IUIC, that will require us to rewrite GenericMethod.
- // Maybe we can replace this with a 'LookupGeneric (string)' instead, but we'll have to
- // handle generic method overrides differently
- DeclSpace GenericDeclContainer { get; }
- }
-
///
/// An Emit Context is created for each body of code (from methods,
/// properties bodies, indexer bodies or constructor bodies)
///
- public class EmitContext : IResolveContext {
-
- //
- // Holds a varible used during collection or object initialization.
- //
- public Expression CurrentInitializerVariable;
-
- DeclSpace decl_space;
-
- public DeclSpace TypeContainer;
+ public class EmitContext : BuilderContext
+ {
+ // TODO: Has to be private
public ILGenerator ig;
- [Flags]
- public enum Flags : int {
- ///
- /// This flag tracks the `checked' state of the compilation,
- /// it controls whether we should generate code that does overflow
- /// checking, or if we generate code that ignores overflows.
- ///
- /// The default setting comes from the command line option to generate
- /// checked or unchecked code plus any source code changes using the
- /// checked/unchecked statements or expressions. Contrast this with
- /// the ConstantCheckState flag.
- ///
- CheckState = 1 << 0,
-
- ///
- /// The constant check state is always set to `true' and cant be changed
- /// from the command line. The source code can change this setting with
- /// the `checked' and `unchecked' statements and expressions.
- ///
- ConstantCheckState = 1 << 1,
-
- AllCheckStateFlags = CheckState | ConstantCheckState,
-
- ///
- /// Whether we are inside an unsafe block
- ///
- InUnsafe = 1 << 2,
-
- InCatch = 1 << 3,
- InFinally = 1 << 4,
-
- ///
- /// Whether control flow analysis is enabled
- ///
- DoFlowAnalysis = 1 << 5,
-
- ///
- /// Whether control flow analysis is disabled on structs
- /// (only meaningful when DoFlowAnalysis is set)
- ///
- OmitStructFlowAnalysis = 1 << 6,
-
- ///
- /// Indicates the current context is in probing mode, no errors are reported.
- ///
- ProbingMode = 1 << 7,
-
- //
- // Inside field intializer expression
- //
- InFieldInitializer = 1 << 8,
-
- InferReturnType = 1 << 9,
-
- InCompoundAssignment = 1 << 10,
-
- OmitDebuggingInfo = 1 << 11
- }
-
- Flags flags;
-
- ///
- /// Whether we are emitting code inside a static or instance method
- ///
- public bool IsStatic;
-
- ///
- /// Whether the actual created method is static or instance method.
- /// Althoug the method might be declared as `static', if an anonymous
- /// method is involved, we might turn this into an instance method.
- ///
- /// So this reflects the low-level staticness of the method, while
- /// IsStatic represents the semantic, high-level staticness.
- ///
- //public bool MethodIsStatic;
-
///
/// The value that is allowed to be returned or NULL if there is no
/// return type.
///
- Type return_type;
-
- ///
- /// Points to the Type (extracted from the TypeContainer) that
- /// declares this body of code
- ///
- public readonly Type ContainerType;
-
- ///
- /// Whether this is generating code for a constructor
- ///
- public bool IsConstructor;
+ TypeSpec return_type;
///
/// Keeps track of the Type to LocalBuilder temporary storage created
/// to store structures (used to compute the address of the structure
/// value on structure method invocations)
///
- public Hashtable temporary_storage;
-
- public Block CurrentBlock;
-
- public int CurrentFile;
+ Dictionary temporary_storage;
///
/// The location where we store the return value.
///
- LocalBuilder return_value;
+ public LocalBuilder return_value;
///
/// The location where return has to jump to return the
@@ -403,543 +272,504 @@ namespace Mono.CSharp {
public bool HasReturnLabel;
///
- /// Whether we are in a `fixed' initialization
+ /// Current loop begin and end labels.
///
- public bool InFixedInitializer;
+ public Label LoopBegin, LoopEnd;
///
- /// Whether we are inside an anonymous method.
+ /// Default target in a switch statement. Only valid if
+ /// InSwitch is true
///
- public AnonymousExpression CurrentAnonymousMethod;
-
+ public Label DefaultTarget;
+
///
- /// Location for this EmitContext
+ /// If this is non-null, points to the current switch statement
///
- public Location loc;
+ public Switch Switch;
///
- /// Inside an enum definition, we do not resolve enumeration values
- /// to their enumerations, but rather to the underlying type/value
- /// This is so EnumVal + EnumValB can be evaluated.
- ///
- /// There is no "E operator + (E x, E y)", so during an enum evaluation
- /// we relax the rules
+ /// Whether we are inside an anonymous method.
///
- public bool InEnumContext;
+ public AnonymousExpression CurrentAnonymousMethod;
+
+ public readonly IMemberContext MemberContext;
- public readonly IResolveContext ResolveContext;
+ public EmitContext (IMemberContext rc, ILGenerator ig, TypeSpec return_type)
+ {
+ this.MemberContext = rc;
+ this.ig = ig;
- ///
- /// The current iterator
- ///
- public Iterator CurrentIterator {
- get { return CurrentAnonymousMethod as Iterator; }
+ this.return_type = return_type;
}
- ///
- /// Whether we are in the resolving stage or not
- ///
- enum Phase {
- Created,
- Resolving,
- Emitting
- }
+#region Properties
- bool isAnonymousMethodAllowed = true;
+ public TypeSpec CurrentType {
+ get { return MemberContext.CurrentType; }
+ }
- Phase current_phase;
- FlowBranching current_flow_branching;
+ public TypeParameter[] CurrentTypeParameters {
+ get { return MemberContext.CurrentTypeParameters; }
+ }
- static int next_id = 0;
- int id = ++next_id;
+ public MemberCore CurrentTypeDefinition {
+ get { return MemberContext.CurrentMemberDefinition; }
+ }
- public override string ToString ()
- {
- return String.Format ("EmitContext ({0}:{1})", id,
- CurrentAnonymousMethod, loc);
+ public bool IsStatic {
+ get { return MemberContext.IsStatic; }
}
-
- public EmitContext (IResolveContext rc, DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
- Type return_type, int code_flags, bool is_constructor)
- {
- this.ResolveContext = rc;
- this.ig = ig;
- TypeContainer = parent;
- this.decl_space = ds;
- if (RootContext.Checked)
- flags |= Flags.CheckState;
- flags |= Flags.ConstantCheckState;
-
- if (return_type == null)
- throw new ArgumentNullException ("return_type");
-
- IsStatic = (code_flags & Modifiers.STATIC) != 0;
- ReturnType = return_type;
- IsConstructor = is_constructor;
- CurrentBlock = null;
- CurrentFile = 0;
- current_phase = Phase.Created;
-
- if (parent != null){
- // Can only be null for the ResolveType contexts.
- ContainerType = parent.TypeBuilder;
- if (rc.IsInUnsafeScope)
- flags |= Flags.InUnsafe;
+ bool IsAnonymousStoreyMutateRequired {
+ get {
+ return CurrentAnonymousMethod != null &&
+ CurrentAnonymousMethod.Storey != null &&
+ CurrentAnonymousMethod.Storey.Mutator != null;
}
- loc = l;
}
- public EmitContext (IResolveContext rc, DeclSpace ds, Location l, ILGenerator ig,
- Type return_type, int code_flags, bool is_constructor)
- : this (rc, ds, ds, l, ig, return_type, code_flags, is_constructor)
- {
+ // Has to be used for emitter errors only
+ public Report Report {
+ get { return MemberContext.Compiler.Report; }
}
- public EmitContext (IResolveContext rc, DeclSpace ds, Location l, ILGenerator ig,
- Type return_type, int code_flags)
- : this (rc, ds, ds, l, ig, return_type, code_flags, false)
- {
+ public TypeSpec ReturnType {
+ get {
+ return return_type;
+ }
}
+#endregion
- // IResolveContext.DeclContainer
- public DeclSpace DeclContainer {
- get { return decl_space; }
- set { decl_space = value; }
- }
+ ///
+ /// This is called immediately before emitting an IL opcode to tell the symbol
+ /// writer to which source line this opcode belongs.
+ ///
+ public void Mark (Location loc)
+ {
+ if (!SymbolWriter.HasSymbolWriter || HasSet (Options.OmitDebugInfo) || loc.IsNull)
+ return;
- // IResolveContext.GenericDeclContainer
- public DeclSpace GenericDeclContainer {
- get { return DeclContainer; }
+ SymbolWriter.MarkSequencePoint (ig, loc);
}
- public bool CheckState {
- get { return (flags & Flags.CheckState) != 0; }
+ public void DefineLocalVariable (string name, LocalBuilder builder)
+ {
+ SymbolWriter.DefineLocalVariable (name, builder);
}
- public bool ConstantCheckState {
- get { return (flags & Flags.ConstantCheckState) != 0; }
+ public void BeginCatchBlock (TypeSpec type)
+ {
+ ig.BeginCatchBlock (type.GetMetaInfo ());
}
- public bool InUnsafe {
- get { return (flags & Flags.InUnsafe) != 0; }
+ public void BeginExceptionBlock ()
+ {
+ ig.BeginExceptionBlock ();
}
- public bool InCatch {
- get { return (flags & Flags.InCatch) != 0; }
+ public void BeginFinallyBlock ()
+ {
+ ig.BeginFinallyBlock ();
}
- public bool InFinally {
- get { return (flags & Flags.InFinally) != 0; }
+ public void BeginScope ()
+ {
+ ig.BeginScope();
+ SymbolWriter.OpenScope(ig);
}
- public bool DoFlowAnalysis {
- get { return (flags & Flags.DoFlowAnalysis) != 0; }
+ public void EndExceptionBlock ()
+ {
+ ig.EndExceptionBlock ();
}
- public bool OmitStructFlowAnalysis {
- get { return (flags & Flags.OmitStructFlowAnalysis) != 0; }
+ public void EndScope ()
+ {
+ ig.EndScope();
+ SymbolWriter.CloseScope(ig);
}
- // utility helper for CheckExpr, UnCheckExpr, Checked and Unchecked statements
- // it's public so that we can use a struct at the callsite
- public struct FlagsHandle : IDisposable
+ public LocalBuilder DeclareLocal (TypeSpec type, bool pinned)
{
- EmitContext ec;
- readonly Flags invmask, oldval;
+ if (IsAnonymousStoreyMutateRequired)
+ type = CurrentAnonymousMethod.Storey.Mutator.Mutate (type);
- public FlagsHandle (EmitContext ec, Flags flagsToSet)
- : this (ec, flagsToSet, flagsToSet)
- {
- }
-
- internal FlagsHandle (EmitContext ec, Flags mask, Flags val)
- {
- this.ec = ec;
- invmask = ~mask;
- oldval = ec.flags & mask;
- ec.flags = (ec.flags & invmask) | (val & mask);
-
- if ((mask & Flags.ProbingMode) != 0)
- Report.DisableReporting ();
- }
-
- public void Dispose ()
- {
- if ((invmask & Flags.ProbingMode) == 0)
- Report.EnableReporting ();
-
- ec.flags = (ec.flags & invmask) | oldval;
- }
+ return ig.DeclareLocal (type.GetMetaInfo (), pinned);
}
- // Temporarily set all the given flags to the given value. Should be used in an 'using' statement
- public FlagsHandle Set (Flags flagsToSet)
+ public Label DefineLabel ()
{
- return new FlagsHandle (this, flagsToSet);
+ return ig.DefineLabel ();
}
- public FlagsHandle With (Flags bits, bool enable)
+ public void MarkLabel (Label label)
{
- return new FlagsHandle (this, bits, enable ? bits : 0);
+ ig.MarkLabel (label);
}
- public FlagsHandle WithFlowAnalysis (bool do_flow_analysis, bool omit_struct_analysis)
+ public void Emit (OpCode opcode)
{
- Flags newflags =
- (do_flow_analysis ? Flags.DoFlowAnalysis : 0) |
- (omit_struct_analysis ? Flags.OmitStructFlowAnalysis : 0);
- return new FlagsHandle (this, Flags.DoFlowAnalysis | Flags.OmitStructFlowAnalysis, newflags);
- }
-
- ///
- /// If this is true, then Return and ContextualReturn statements
- /// will set the ReturnType value based on the expression types
- /// of each return statement instead of the method return type
- /// (which is initially null).
- ///
- public bool InferReturnType {
- get { return (flags & Flags.InferReturnType) != 0; }
- }
-
- // IResolveContext.IsInObsoleteScope
- public bool IsInObsoleteScope {
- get {
- // Disables obsolete checks when probing is on
- return IsInProbingMode || ResolveContext.IsInObsoleteScope;
- }
+ ig.Emit (opcode);
}
- public bool IsInProbingMode {
- get { return (flags & Flags.ProbingMode) != 0; }
+ public void Emit (OpCode opcode, LocalBuilder local)
+ {
+ ig.Emit (opcode, local);
}
- // IResolveContext.IsInUnsafeScope
- public bool IsInUnsafeScope {
- get { return InUnsafe || ResolveContext.IsInUnsafeScope; }
+ public void Emit (OpCode opcode, string arg)
+ {
+ ig.Emit (opcode, arg);
}
- public bool IsAnonymousMethodAllowed {
- get { return isAnonymousMethodAllowed; }
- set { isAnonymousMethodAllowed = value; }
+ public void Emit (OpCode opcode, double arg)
+ {
+ ig.Emit (opcode, arg);
}
- public bool IsInFieldInitializer {
- get { return (flags & Flags.InFieldInitializer) != 0; }
- }
-
- public bool IsInCompoundAssignment {
- get { return (flags & Flags.InCompoundAssignment) != 0; }
+ public void Emit (OpCode opcode, float arg)
+ {
+ ig.Emit (opcode, arg);
}
- public bool IsVariableCapturingRequired {
- get {
- return !IsInProbingMode && (CurrentBranching == null || !CurrentBranching.CurrentUsageVector.IsUnreachable);
- }
+ public void Emit (OpCode opcode, int arg)
+ {
+ ig.Emit (opcode, arg);
}
- public FlowBranching CurrentBranching {
- get { return current_flow_branching; }
+ public void Emit (OpCode opcode, byte arg)
+ {
+ ig.Emit (opcode, arg);
}
- public bool OmitDebuggingInfo {
- get { return (flags & Flags.OmitDebuggingInfo) != 0; }
- set {
- if (value)
- flags |= Flags.OmitDebuggingInfo;
- else
- flags &= ~Flags.OmitDebuggingInfo;
- }
+ public void Emit (OpCode opcode, Label label)
+ {
+ ig.Emit (opcode, label);
}
- //
- // Starts a new code branching. This inherits the state of all local
- // variables and parameters from the current branching.
- //
- public FlowBranching StartFlowBranching (FlowBranching.BranchingType type, Location loc)
+ public void Emit (OpCode opcode, Label[] labels)
{
- current_flow_branching = FlowBranching.CreateBranching (CurrentBranching, type, null, loc);
- return current_flow_branching;
+ ig.Emit (opcode, labels);
}
- //
- // Starts a new code branching for block `block'.
- //
- public FlowBranching StartFlowBranching (Block block)
+ public void Emit (OpCode opcode, TypeSpec type)
{
- flags |= Flags.DoFlowAnalysis;
+ if (IsAnonymousStoreyMutateRequired)
+ type = CurrentAnonymousMethod.Storey.Mutator.Mutate (type);
- current_flow_branching = FlowBranching.CreateBranching (
- CurrentBranching, FlowBranching.BranchingType.Block, block, block.StartLocation);
- return current_flow_branching;
+ ig.Emit (opcode, type.GetMetaInfo ());
}
- public FlowBranchingTryCatch StartFlowBranching (TryCatch stmt)
+ public void Emit (OpCode opcode, FieldSpec field)
{
- FlowBranchingTryCatch branching = new FlowBranchingTryCatch (CurrentBranching, stmt);
- current_flow_branching = branching;
- return branching;
- }
+ if (IsAnonymousStoreyMutateRequired)
+ field = field.Mutate (CurrentAnonymousMethod.Storey.Mutator);
- public FlowBranchingException StartFlowBranching (ExceptionStatement stmt)
- {
- FlowBranchingException branching = new FlowBranchingException (CurrentBranching, stmt);
- current_flow_branching = branching;
- return branching;
+ ig.Emit (opcode, field.GetMetaInfo ());
}
- public FlowBranchingLabeled StartFlowBranching (LabeledStatement stmt)
+ public void Emit (OpCode opcode, MethodSpec method)
{
- FlowBranchingLabeled branching = new FlowBranchingLabeled (CurrentBranching, stmt);
- current_flow_branching = branching;
- return branching;
+ if (IsAnonymousStoreyMutateRequired)
+ method = method.Mutate (CurrentAnonymousMethod.Storey.Mutator);
+
+ if (method.IsConstructor)
+ ig.Emit (opcode, (ConstructorInfo) method.GetMetaInfo ());
+ else
+ ig.Emit (opcode, (MethodInfo) method.GetMetaInfo ());
}
- public FlowBranchingIterator StartFlowBranching (Iterator iterator)
+ // TODO: REMOVE breaks mutator
+ public void Emit (OpCode opcode, MethodInfo method)
{
- FlowBranchingIterator branching = new FlowBranchingIterator (CurrentBranching, iterator);
- current_flow_branching = branching;
- return branching;
+ ig.Emit (opcode, method);
}
- public FlowBranchingToplevel StartFlowBranching (ToplevelBlock stmt)
+ // TODO: REMOVE breaks mutator
+ public void Emit (OpCode opcode, FieldBuilder field)
{
- FlowBranchingToplevel branching = new FlowBranchingToplevel (CurrentBranching, stmt);
- current_flow_branching = branching;
- return branching;
+ ig.Emit (opcode, field);
}
- //
- // Ends a code branching. Merges the state of locals and parameters
- // from all the children of the ending branching.
- //
- public bool EndFlowBranching ()
+ public void Emit (OpCode opcode, MethodSpec method, Type[] vargs)
{
- FlowBranching old = current_flow_branching;
- current_flow_branching = current_flow_branching.Parent;
-
- FlowBranching.UsageVector vector = current_flow_branching.MergeChild (old);
- return vector.IsUnreachable;
+ // TODO MemberCache: This should mutate too
+ ig.EmitCall (opcode, (MethodInfo) method.GetMetaInfo (), vargs);
}
- //
- // Kills the current code branching. This throws away any changed state
- // information and should only be used in case of an error.
- //
- // FIXME: this is evil
- public void KillFlowBranching ()
+ public void EmitArrayNew (ArrayContainer ac)
{
- current_flow_branching = current_flow_branching.Parent;
+ if (ac.Rank == 1) {
+ Emit (OpCodes.Newarr, ac.Element);
+ } else {
+ if (IsAnonymousStoreyMutateRequired)
+ ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
+
+ ig.Emit (OpCodes.Newobj, ac.GetConstructor ());
+ }
}
- public bool MustCaptureVariable (LocalInfo local)
+ public void EmitArrayAddress (ArrayContainer ac)
{
- if (CurrentAnonymousMethod == null)
- return false;
+ if (ac.Element.IsGenericParameter)
+ ig.Emit (OpCodes.Readonly);
- // FIXME: IsIterator is too aggressive, we should capture only if child
- // block contains yield
- if (CurrentAnonymousMethod.IsIterator)
- return true;
+ if (ac.Rank > 1) {
+ if (IsAnonymousStoreyMutateRequired)
+ ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
- return local.Block.Toplevel != CurrentBlock.Toplevel;
+ ig.Emit (OpCodes.Call, ac.GetAddressMethod ());
+ } else {
+ Emit (OpCodes.Ldelema, ac.Element);
+ }
}
-
- public void EmitMeta (ToplevelBlock b)
+
+ //
+ // Emits the right opcode to load from an array
+ //
+ public void EmitArrayLoad (ArrayContainer ac)
{
- b.EmitMeta (this);
+ if (ac.Rank > 1) {
+ if (IsAnonymousStoreyMutateRequired)
+ ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
+
+ ig.Emit (OpCodes.Call, ac.GetGetMethod ());
+ return;
+ }
- if (HasReturnLabel)
- ReturnLabel = ig.DefineLabel ();
+ var type = ac.Element;
+ if (TypeManager.IsEnumType (type))
+ type = EnumSpec.GetUnderlyingType (type);
+
+ if (type == TypeManager.byte_type || type == TypeManager.bool_type)
+ Emit (OpCodes.Ldelem_U1);
+ else if (type == TypeManager.sbyte_type)
+ Emit (OpCodes.Ldelem_I1);
+ else if (type == TypeManager.short_type)
+ Emit (OpCodes.Ldelem_I2);
+ else if (type == TypeManager.ushort_type || type == TypeManager.char_type)
+ Emit (OpCodes.Ldelem_U2);
+ else if (type == TypeManager.int32_type)
+ Emit (OpCodes.Ldelem_I4);
+ else if (type == TypeManager.uint32_type)
+ Emit (OpCodes.Ldelem_U4);
+ else if (type == TypeManager.uint64_type)
+ Emit (OpCodes.Ldelem_I8);
+ else if (type == TypeManager.int64_type)
+ Emit (OpCodes.Ldelem_I8);
+ else if (type == TypeManager.float_type)
+ Emit (OpCodes.Ldelem_R4);
+ else if (type == TypeManager.double_type)
+ Emit (OpCodes.Ldelem_R8);
+ else if (type == TypeManager.intptr_type)
+ Emit (OpCodes.Ldelem_I);
+ else if (TypeManager.IsStruct (type)) {
+ Emit (OpCodes.Ldelema, type);
+ Emit (OpCodes.Ldobj, type);
+ } else if (type.IsGenericParameter) {
+ Emit (OpCodes.Ldelem, type);
+ } else if (type.IsPointer)
+ Emit (OpCodes.Ldelem_I);
+ else
+ Emit (OpCodes.Ldelem_Ref);
}
//
- // Here until we can fix the problem with Mono.CSharp.Switch, which
- // currently can not cope with ig == null during resolve (which must
- // be fixed for switch statements to work on anonymous methods).
+ // Emits the right opcode to store to an array
//
- public void EmitTopBlock (IMethodData md, ToplevelBlock block)
+ public void EmitArrayStore (ArrayContainer ac)
{
- if (block == null)
- return;
-
- bool unreachable;
-
- if (ResolveTopBlock (null, block, md.ParameterInfo, md, out unreachable)){
- if (Report.Errors > 0)
- return;
-
- EmitMeta (block);
+ if (ac.Rank > 1) {
+ if (IsAnonymousStoreyMutateRequired)
+ ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
- current_phase = Phase.Emitting;
-#if PRODUCTION
- try {
-#endif
- EmitResolvedTopBlock (block, unreachable);
-#if PRODUCTION
- } catch (Exception e){
- Console.WriteLine ("Exception caught by the compiler while emitting:");
- Console.WriteLine (" Block that caused the problem begin at: " + block.loc);
-
- Console.WriteLine (e.GetType ().FullName + ": " + e.Message);
- throw;
- }
-#endif
+ ig.Emit (OpCodes.Call, ac.GetSetMethod ());
+ return;
}
+
+ var type = ac.Element;
+
+ if (type.IsEnum)
+ type = EnumSpec.GetUnderlyingType (type);
+
+ if (type == TypeManager.byte_type || type == TypeManager.sbyte_type || type == TypeManager.bool_type)
+ Emit (OpCodes.Stelem_I1);
+ else if (type == TypeManager.short_type || type == TypeManager.ushort_type || type == TypeManager.char_type)
+ Emit (OpCodes.Stelem_I2);
+ else if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
+ Emit (OpCodes.Stelem_I4);
+ else if (type == TypeManager.int64_type || type == TypeManager.uint64_type)
+ Emit (OpCodes.Stelem_I8);
+ else if (type == TypeManager.float_type)
+ Emit (OpCodes.Stelem_R4);
+ else if (type == TypeManager.double_type)
+ Emit (OpCodes.Stelem_R8);
+ else if (type == TypeManager.intptr_type)
+ Emit (OpCodes.Stobj, type);
+ else if (TypeManager.IsStruct (type))
+ Emit (OpCodes.Stobj, type);
+ else if (type.IsGenericParameter)
+ Emit (OpCodes.Stelem, type);
+ else if (type.IsPointer)
+ Emit (OpCodes.Stelem_I);
+ else
+ Emit (OpCodes.Stelem_Ref);
}
- bool resolved;
- bool unreachable;
-
- public bool ResolveTopBlock (EmitContext anonymous_method_host, ToplevelBlock block,
- ParametersCompiled ip, IMethodData md, out bool unreachable)
+ public void EmitInt (int i)
{
- if (resolved) {
- unreachable = this.unreachable;
- return true;
- }
+ switch (i) {
+ case -1:
+ ig.Emit (OpCodes.Ldc_I4_M1);
+ break;
- current_phase = Phase.Resolving;
- unreachable = false;
+ case 0:
+ ig.Emit (OpCodes.Ldc_I4_0);
+ break;
- if (!loc.IsNull)
- CurrentFile = loc.File;
+ case 1:
+ ig.Emit (OpCodes.Ldc_I4_1);
+ break;
-#if PRODUCTION
- try {
-#endif
- if (!block.ResolveMeta (this, ip))
- return false;
+ case 2:
+ ig.Emit (OpCodes.Ldc_I4_2);
+ break;
- using (this.With (EmitContext.Flags.DoFlowAnalysis, true)) {
- FlowBranchingToplevel top_level;
- if (anonymous_method_host != null)
- top_level = new FlowBranchingToplevel (anonymous_method_host.CurrentBranching, block);
- else
- top_level = block.TopLevelBranching;
+ case 3:
+ ig.Emit (OpCodes.Ldc_I4_3);
+ break;
- current_flow_branching = top_level;
- bool ok = block.Resolve (this);
- current_flow_branching = null;
+ case 4:
+ ig.Emit (OpCodes.Ldc_I4_4);
+ break;
- if (!ok)
- return false;
+ case 5:
+ ig.Emit (OpCodes.Ldc_I4_5);
+ break;
- bool flow_unreachable = top_level.End ();
- if (flow_unreachable)
- this.unreachable = unreachable = true;
- }
-#if PRODUCTION
- } catch (Exception e) {
- Console.WriteLine ("Exception caught by the compiler while compiling:");
- Console.WriteLine (" Block that caused the problem begin at: " + loc);
-
- if (CurrentBlock != null){
- Console.WriteLine (" Block being compiled: [{0},{1}]",
- CurrentBlock.StartLocation, CurrentBlock.EndLocation);
- }
- Console.WriteLine (e.GetType ().FullName + ": " + e.Message);
- throw;
- }
-#endif
+ case 6:
+ ig.Emit (OpCodes.Ldc_I4_6);
+ break;
- if (return_type != TypeManager.void_type && !unreachable) {
- if (CurrentAnonymousMethod == null) {
- Report.Error (161, md.Location, "`{0}': not all code paths return a value", md.GetSignatureForError ());
- return false;
- } else if (!CurrentAnonymousMethod.IsIterator) {
- Report.Error (1643, CurrentAnonymousMethod.Location, "Not all code paths return a value in anonymous method of type `{0}'",
- CurrentAnonymousMethod.GetSignatureForError ());
- return false;
- }
- }
+ case 7:
+ ig.Emit (OpCodes.Ldc_I4_7);
+ break;
- resolved = true;
- return true;
- }
+ case 8:
+ ig.Emit (OpCodes.Ldc_I4_8);
+ break;
- public Type ReturnType {
- set {
- return_type = value;
- }
- get {
- return return_type;
+ default:
+ if (i >= -128 && i <= 127) {
+ ig.Emit (OpCodes.Ldc_I4_S, (sbyte) i);
+ } else
+ ig.Emit (OpCodes.Ldc_I4, i);
+ break;
}
}
- public void EmitResolvedTopBlock (ToplevelBlock block, bool unreachable)
+ public void EmitLong (long l)
{
- if (block != null)
- block.Emit (this);
-
- if (HasReturnLabel)
- ig.MarkLabel (ReturnLabel);
-
- if (return_value != null){
- ig.Emit (OpCodes.Ldloc, return_value);
- ig.Emit (OpCodes.Ret);
- } else {
- //
- // If `HasReturnLabel' is set, then we already emitted a
- // jump to the end of the method, so we must emit a `ret'
- // there.
- //
- // Unfortunately, System.Reflection.Emit automatically emits
- // a leave to the end of a finally block. This is a problem
- // if no code is following the try/finally block since we may
- // jump to a point after the end of the method.
- // As a workaround, we're always creating a return label in
- // this case.
- //
-
- if (HasReturnLabel || !unreachable) {
- if (return_type != TypeManager.void_type)
- ig.Emit (OpCodes.Ldloc, TemporaryReturn ());
- ig.Emit (OpCodes.Ret);
- }
+ if (l >= int.MinValue && l <= int.MaxValue) {
+ EmitInt (unchecked ((int) l));
+ ig.Emit (OpCodes.Conv_I8);
+ return;
}
- }
- ///
- /// This is called immediately before emitting an IL opcode to tell the symbol
- /// writer to which source line this opcode belongs.
- ///
- public void Mark (Location loc)
- {
- if (!SymbolWriter.HasSymbolWriter || OmitDebuggingInfo || loc.IsNull)
+ if (l >= 0 && l <= uint.MaxValue) {
+ EmitInt (unchecked ((int) l));
+ ig.Emit (OpCodes.Conv_U8);
return;
+ }
- SymbolWriter.MarkSequencePoint (ig, loc);
- }
-
- public void DefineLocalVariable (string name, LocalBuilder builder)
- {
- SymbolWriter.DefineLocalVariable (name, builder);
+ ig.Emit (OpCodes.Ldc_I8, l);
}
- public void BeginScope ()
+ //
+ // Load the object from the pointer.
+ //
+ public void EmitLoadFromPtr (TypeSpec t)
{
- ig.BeginScope();
- SymbolWriter.OpenScope(ig);
+ if (t == TypeManager.int32_type)
+ ig.Emit (OpCodes.Ldind_I4);
+ else if (t == TypeManager.uint32_type)
+ ig.Emit (OpCodes.Ldind_U4);
+ else if (t == TypeManager.short_type)
+ ig.Emit (OpCodes.Ldind_I2);
+ else if (t == TypeManager.ushort_type)
+ ig.Emit (OpCodes.Ldind_U2);
+ else if (t == TypeManager.char_type)
+ ig.Emit (OpCodes.Ldind_U2);
+ else if (t == TypeManager.byte_type)
+ ig.Emit (OpCodes.Ldind_U1);
+ else if (t == TypeManager.sbyte_type)
+ ig.Emit (OpCodes.Ldind_I1);
+ else if (t == TypeManager.uint64_type)
+ ig.Emit (OpCodes.Ldind_I8);
+ else if (t == TypeManager.int64_type)
+ ig.Emit (OpCodes.Ldind_I8);
+ else if (t == TypeManager.float_type)
+ ig.Emit (OpCodes.Ldind_R4);
+ else if (t == TypeManager.double_type)
+ ig.Emit (OpCodes.Ldind_R8);
+ else if (t == TypeManager.bool_type)
+ ig.Emit (OpCodes.Ldind_I1);
+ else if (t == TypeManager.intptr_type)
+ ig.Emit (OpCodes.Ldind_I);
+ else if (t.IsEnum) {
+ if (t == TypeManager.enum_type)
+ ig.Emit (OpCodes.Ldind_Ref);
+ else
+ EmitLoadFromPtr (EnumSpec.GetUnderlyingType (t));
+ } else if (TypeManager.IsStruct (t) || TypeManager.IsGenericParameter (t))
+ Emit (OpCodes.Ldobj, t);
+ else if (t.IsPointer)
+ ig.Emit (OpCodes.Ldind_I);
+ else
+ ig.Emit (OpCodes.Ldind_Ref);
}
- public void EndScope ()
+ //
+ // The stack contains the pointer and the value of type `type'
+ //
+ public void EmitStoreFromPtr (TypeSpec type)
{
- ig.EndScope();
- SymbolWriter.CloseScope(ig);
+ if (type.IsEnum)
+ type = EnumSpec.GetUnderlyingType (type);
+
+ if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
+ ig.Emit (OpCodes.Stind_I4);
+ else if (type == TypeManager.int64_type || type == TypeManager.uint64_type)
+ ig.Emit (OpCodes.Stind_I8);
+ else if (type == TypeManager.char_type || type == TypeManager.short_type ||
+ type == TypeManager.ushort_type)
+ ig.Emit (OpCodes.Stind_I2);
+ else if (type == TypeManager.float_type)
+ ig.Emit (OpCodes.Stind_R4);
+ else if (type == TypeManager.double_type)
+ ig.Emit (OpCodes.Stind_R8);
+ else if (type == TypeManager.byte_type || type == TypeManager.sbyte_type ||
+ type == TypeManager.bool_type)
+ ig.Emit (OpCodes.Stind_I1);
+ else if (type == TypeManager.intptr_type)
+ ig.Emit (OpCodes.Stind_I);
+ else if (TypeManager.IsStruct (type) || TypeManager.IsGenericParameter (type))
+ ig.Emit (OpCodes.Stobj, type.GetMetaInfo ());
+ else
+ ig.Emit (OpCodes.Stind_Ref);
}
///
/// Returns a temporary storage for a variable of type t as
/// a local variable in the current body.
///
- public LocalBuilder GetTemporaryLocal (Type t)
+ public LocalBuilder GetTemporaryLocal (TypeSpec t)
{
if (temporary_storage != null) {
- object o = temporary_storage [t];
- if (o != null) {
- if (o is Stack) {
- Stack s = (Stack) o;
+ object o;
+ if (temporary_storage.TryGetValue (t, out o)) {
+ if (o is Stack) {
+ var s = (Stack) o;
o = s.Count == 0 ? null : s.Pop ();
} else {
temporary_storage.Remove (t);
@@ -948,46 +778,31 @@ namespace Mono.CSharp {
if (o != null)
return (LocalBuilder) o;
}
- return ig.DeclareLocal (t);
+ return DeclareLocal (t, false);
}
- public void FreeTemporaryLocal (LocalBuilder b, Type t)
+ public void FreeTemporaryLocal (LocalBuilder b, TypeSpec t)
{
if (temporary_storage == null) {
- temporary_storage = new Hashtable ();
- temporary_storage [t] = b;
+ temporary_storage = new Dictionary (ReferenceEquality.Default);
+ temporary_storage.Add (t, b);
return;
}
- object o = temporary_storage [t];
- if (o == null) {
- temporary_storage [t] = b;
+ object o;
+
+ if (!temporary_storage.TryGetValue (t, out o)) {
+ temporary_storage.Add (t, b);
return;
}
- Stack s = o as Stack;
+ var s = o as Stack;
if (s == null) {
- s = new Stack ();
- s.Push (o);
+ s = new Stack ();
+ s.Push ((LocalBuilder)o);
temporary_storage [t] = s;
}
s.Push (b);
}
- ///
- /// Current loop begin and end labels.
- ///
- public Label LoopBegin, LoopEnd;
-
- ///
- /// Default target in a switch statement. Only valid if
- /// InSwitch is true
- ///
- public Label DefaultTarget;
-
- ///
- /// If this is non-null, points to the current switch statement
- ///
- public Switch Switch;
-
///
/// ReturnValue creates on demand the LocalBuilder for the
/// return value from the function. By default this is not
@@ -1003,62 +818,23 @@ namespace Mono.CSharp {
public LocalBuilder TemporaryReturn ()
{
if (return_value == null){
- return_value = ig.DeclareLocal (return_type);
+ return_value = DeclareLocal (return_type, false);
if (!HasReturnLabel){
- ReturnLabel = ig.DefineLabel ();
+ ReturnLabel = DefineLabel ();
HasReturnLabel = true;
}
}
return return_value;
}
-
- ///
- /// This method is used during the Resolution phase to flag the
- /// need to define the ReturnLabel
- ///
- public void NeedReturnLabel ()
- {
- if (current_phase != Phase.Resolving){
- //
- // The reason is that the `ReturnLabel' is declared between
- // resolution and emission
- //
- throw new Exception ("NeedReturnLabel called from Emit phase, should only be called during Resolve");
- }
-
- if (!HasReturnLabel)
- HasReturnLabel = true;
- }
-
-
- public Expression GetThis (Location loc)
- {
- This my_this;
- if (CurrentBlock != null)
- my_this = new This (CurrentBlock, loc);
- else
- my_this = new This (loc);
-
- if (!my_this.ResolveBase (this))
- my_this = null;
-
- return my_this;
- }
}
-
- public abstract class CommonAssemblyModulClass : Attributable, IResolveContext {
-
- protected CommonAssemblyModulClass ():
- base (null)
- {
- }
-
- public void AddAttributes (ArrayList attrs)
+ public abstract class CommonAssemblyModulClass : Attributable, IMemberContext
+ {
+ public void AddAttributes (List attrs, IMemberContext context)
{
foreach (Attribute a in attrs)
- a.AttachTo (this);
+ a.AttachTo (this, context);
if (attributes == null) {
attributes = new Attributes (attrs);
@@ -1084,28 +860,60 @@ namespace Mono.CSharp {
return a;
}
- public override IResolveContext ResolveContext {
- get { return this; }
+ #region IMemberContext Members
+
+ public CompilerContext Compiler {
+ get { return RootContext.ToplevelTypes.Compiler; }
+ }
+
+ public TypeSpec CurrentType {
+ get { return null; }
}
- #region IResolveContext Members
+ public TypeParameter[] CurrentTypeParameters {
+ get { return null; }
+ }
- public DeclSpace DeclContainer {
+ public MemberCore CurrentMemberDefinition {
get { return RootContext.ToplevelTypes; }
}
- public DeclSpace GenericDeclContainer {
- get { return DeclContainer; }
+ public string GetSignatureForError ()
+ {
+ return "";
+ }
+
+ public bool HasUnresolvedConstraints {
+ get { return false; }
+ }
+
+ public bool IsObsolete {
+ get { return false; }
}
- public bool IsInObsoleteScope {
+ public bool IsUnsafe {
get { return false; }
}
- public bool IsInUnsafeScope {
+ public bool IsStatic {
get { return false; }
}
+ public ExtensionMethodGroupExpr LookupExtensionMethod (TypeSpec extensionType, string name, int arity, Location loc)
+ {
+ throw new NotImplementedException ();
+ }
+
+ public FullNamedExpression LookupNamespaceOrType (string name, int arity, Location loc, bool ignore_cs0104)
+ {
+ return RootContext.ToplevelTypes.LookupNamespaceOrType (name, arity, loc, ignore_cs0104);
+ }
+
+ public FullNamedExpression LookupNamespaceAlias (string name)
+ {
+ return null;
+ }
+
#endregion
}
@@ -1117,16 +925,16 @@ namespace Mono.CSharp {
public Attribute ClsCompliantAttribute;
- ListDictionary declarative_security;
+ Dictionary declarative_security;
bool has_extension_method;
public AssemblyName Name;
MethodInfo add_type_forwarder;
- ListDictionary emitted_forwarders;
+ Dictionary emitted_forwarders;
// Module is here just because of error messages
static string[] attribute_targets = new string [] { "assembly", "module" };
- public AssemblyClass (): base ()
+ public AssemblyClass ()
{
wrap_non_exception_throws = true;
}
@@ -1160,6 +968,10 @@ namespace Mono.CSharp {
return is_cls_compliant;
}
+ Report Report {
+ get { return Compiler.Report; }
+ }
+
public void Resolve ()
{
if (RootContext.Unsafe) {
@@ -1173,18 +985,19 @@ namespace Mono.CSharp {
MemberAccess system_security_permissions = new MemberAccess (new MemberAccess (
new QualifiedAliasMember (QualifiedAliasMember.GlobalAlias, "System", loc), "Security", loc), "Permissions", loc);
- ArrayList pos = new ArrayList (1);
+ Arguments pos = new Arguments (1);
pos.Add (new Argument (new MemberAccess (new MemberAccess (system_security_permissions, "SecurityAction", loc), "RequestMinimum")));
- ArrayList named = new ArrayList (1);
- named.Add (new NamedArgument (new LocatedToken (loc, "SkipVerification"), (new BoolLiteral (true, loc))));
+ Arguments named = new Arguments (1);
+ named.Add (new NamedArgument ("SkipVerification", loc, new BoolLiteral (true, loc)));
- GlobalAttribute g = new GlobalAttribute (new NamespaceEntry (null, null, null), "assembly", system_security_permissions,
- "SecurityPermissionAttribute", new object[] { pos, named }, loc, false);
- g.AttachTo (this);
+ GlobalAttribute g = new GlobalAttribute (new NamespaceEntry (null, null, null), "assembly",
+ new MemberAccess (system_security_permissions, "SecurityPermissionAttribute"),
+ new Arguments[] { pos, named }, loc, false);
+ g.AttachTo (this, this);
if (g.Resolve () != null) {
- declarative_security = new ListDictionary ();
+ declarative_security = new Dictionary ();
g.ExtractSecurityPermissionSet (declarative_security);
}
}
@@ -1204,9 +1017,9 @@ namespace Mono.CSharp {
Attribute a = ResolveAttribute (PredefinedAttributes.Get.RuntimeCompatibility);
if (a != null) {
- object val = a.GetPropertyValue ("WrapNonExceptionThrows");
+ var val = a.GetPropertyValue ("WrapNonExceptionThrows") as BoolConstant;
if (val != null)
- wrap_non_exception_throws = (bool) val;
+ wrap_non_exception_throws = val.Value;
}
}
@@ -1258,7 +1071,7 @@ namespace Mono.CSharp {
case "AssemblyKeyFileAttribute":
case "System.Reflection.AssemblyKeyFileAttribute":
if (RootContext.StrongNameKeyFile != null) {
- Report.SymbolRelatedToPreviousError (a.Location, a.Name);
+ Report.SymbolRelatedToPreviousError (a.Location, a.GetSignatureForError ());
Report.Warning (1616, 1, "Option `{0}' overrides attribute `{1}' given in a source file or added module",
"keyfile", "System.Reflection.AssemblyKeyFileAttribute");
} else {
@@ -1271,7 +1084,7 @@ namespace Mono.CSharp {
case "AssemblyKeyNameAttribute":
case "System.Reflection.AssemblyKeyNameAttribute":
if (RootContext.StrongNameKeyContainer != null) {
- Report.SymbolRelatedToPreviousError (a.Location, a.Name);
+ Report.SymbolRelatedToPreviousError (a.Location, a.GetSignatureForError ());
Report.Warning (1616, 1, "Option `{0}' overrides attribute `{1}' given in a source file or added module",
"keycontainer", "System.Reflection.AssemblyKeyNameAttribute");
} else {
@@ -1366,11 +1179,7 @@ namespace Mono.CSharp {
AssemblyName aname = null;
try {
-#if GMCS_SOURCE
aname = new AssemblyName (assembly_name);
-#else
- throw new NotSupportedException ();
-#endif
} catch (FileLoadException) {
} catch (ArgumentException) {
}
@@ -1391,7 +1200,7 @@ namespace Mono.CSharp {
return true;
}
- static bool IsValidAssemblyVersion (string version)
+ static string IsValidAssemblyVersion (string version)
{
Version v;
try {
@@ -1401,23 +1210,23 @@ namespace Mono.CSharp {
int major = int.Parse (version, CultureInfo.InvariantCulture);
v = new Version (major, 0);
} catch {
- return false;
+ return null;
}
}
foreach (int candidate in new int [] { v.Major, v.Minor, v.Build, v.Revision }) {
if (candidate > ushort.MaxValue)
- return false;
+ return null;
}
- return true;
+ return new Version (v.Major, System.Math.Max (0, v.Minor), System.Math.Max (0, v.Build), System.Math.Max (0, v.Revision)).ToString (4);
}
- public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+ public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
{
if (a.IsValidSecurityAttribute ()) {
if (declarative_security == null)
- declarative_security = new ListDictionary ();
+ declarative_security = new Dictionary ();
a.ExtractSecurityPermissionSet (declarative_security);
return;
@@ -1432,6 +1241,15 @@ namespace Mono.CSharp {
a.Error_AttributeEmitError ("The executables cannot be satelite assemblies, remove the attribute or keep it empty");
return;
}
+
+ try {
+ var fi = typeof (AssemblyBuilder).GetField ("culture", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.SetField);
+ fi.SetValue (CodeGen.Assembly.Builder, value == "neutral" ? "" : value);
+ } catch {
+ Report.RuntimeMissingSupport (a.Location, "AssemblyCultureAttribute setting");
+ }
+
+ return;
}
if (a.Type == pa.AssemblyVersion) {
@@ -1439,44 +1257,89 @@ namespace Mono.CSharp {
if (value == null || value.Length == 0)
return;
- value = value.Replace ('*', '0');
-
- if (!IsValidAssemblyVersion (value)) {
+ var vinfo = IsValidAssemblyVersion (value.Replace ('*', '0'));
+ if (vinfo == null) {
a.Error_AttributeEmitError (string.Format ("Specified version `{0}' is not valid", value));
return;
}
+
+ try {
+ var fi = typeof (AssemblyBuilder).GetField ("version", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.SetField);
+ fi.SetValue (CodeGen.Assembly.Builder, vinfo);
+ } catch {
+ Report.RuntimeMissingSupport (a.Location, "AssemblyVersionAttribute setting");
+ }
+
+ return;
+ }
+
+ if (a.Type == pa.AssemblyAlgorithmId) {
+ const int pos = 2; // skip CA header
+ uint alg = (uint) cdata [pos];
+ alg |= ((uint) cdata [pos + 1]) << 8;
+ alg |= ((uint) cdata [pos + 2]) << 16;
+ alg |= ((uint) cdata [pos + 3]) << 24;
+
+ try {
+ var fi = typeof (AssemblyBuilder).GetField ("algid", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.SetField);
+ fi.SetValue (CodeGen.Assembly.Builder, alg);
+ } catch {
+ Report.RuntimeMissingSupport (a.Location, "AssemblyAlgorithmIdAttribute setting");
+ }
+
+ return;
+ }
+
+ if (a.Type == pa.AssemblyFlags) {
+ const int pos = 2; // skip CA header
+ uint flags = (uint) cdata[pos];
+ flags |= ((uint) cdata[pos + 1]) << 8;
+ flags |= ((uint) cdata[pos + 2]) << 16;
+ flags |= ((uint) cdata[pos + 3]) << 24;
+
+ // Ignore set PublicKey flag if assembly is not strongnamed
+ if ((flags & (uint) AssemblyNameFlags.PublicKey) != 0 && (CodeGen.Assembly.Builder.GetName ().KeyPair == null))
+ flags &= ~(uint)AssemblyNameFlags.PublicKey;
+
+ try {
+ var fi = typeof (AssemblyBuilder).GetField ("flags", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.SetField);
+ fi.SetValue (CodeGen.Assembly.Builder, flags);
+ } catch {
+ Report.RuntimeMissingSupport (a.Location, "AssemblyFlagsAttribute setting");
+ }
+
+ return;
}
if (a.Type == pa.InternalsVisibleTo && !CheckInternalsVisibleAttribute (a))
return;
if (a.Type == pa.TypeForwarder) {
- Type t = a.GetArgumentType ();
+ TypeSpec t = a.GetArgumentType ();
if (t == null || TypeManager.HasElementType (t)) {
Report.Error (735, a.Location, "Invalid type specified as an argument for TypeForwardedTo attribute");
return;
}
- t = TypeManager.DropGenericTypeArguments (t);
if (emitted_forwarders == null) {
- emitted_forwarders = new ListDictionary();
- } else if (emitted_forwarders.Contains(t)) {
- Report.SymbolRelatedToPreviousError(((Attribute)emitted_forwarders[t]).Location, null);
+ emitted_forwarders = new Dictionary ();
+ } else if (emitted_forwarders.ContainsKey (t.MemberDefinition)) {
+ Report.SymbolRelatedToPreviousError(emitted_forwarders[t.MemberDefinition].Location, null);
Report.Error(739, a.Location, "A duplicate type forward of type `{0}'",
TypeManager.CSharpName(t));
return;
}
- emitted_forwarders.Add(t, a);
+ emitted_forwarders.Add(t.MemberDefinition, a);
- if (TypeManager.LookupDeclSpace (t) != null) {
+ if (t.Assembly == Builder) {
Report.SymbolRelatedToPreviousError (t);
Report.Error (729, a.Location, "Cannot forward type `{0}' because it is defined in this assembly",
TypeManager.CSharpName (t));
return;
}
- if (t.DeclaringType != null) {
+ if (t.IsNested) {
Report.Error (730, a.Location, "Cannot forward type `{0}' because it is a nested type",
TypeManager.CSharpName (t));
return;
@@ -1492,7 +1355,7 @@ namespace Mono.CSharp {
}
}
- add_type_forwarder.Invoke (Builder, new object[] { t });
+ add_type_forwarder.Invoke (Builder, new object[] { t.GetMetaInfo () });
return;
}
@@ -1501,7 +1364,7 @@ namespace Mono.CSharp {
return;
}
- Builder.SetCustomAttribute (cb);
+ Builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), cdata);
}
public override void Emit (TypeContainer tc)
@@ -1514,14 +1377,13 @@ namespace Mono.CSharp {
// FIXME: Does this belong inside SRE.AssemblyBuilder instead?
PredefinedAttribute pa = PredefinedAttributes.Get.RuntimeCompatibility;
if (pa.IsDefined && (OptAttributes == null || !OptAttributes.Contains (pa))) {
- ConstructorInfo ci = TypeManager.GetPredefinedConstructor (
- pa.Type, Location.Null, Type.EmptyTypes);
+ var ci = TypeManager.GetPredefinedConstructor (pa.Type, Location.Null, TypeSpec.EmptyTypes);
PropertyInfo [] pis = new PropertyInfo [1];
pis [0] = TypeManager.GetPredefinedProperty (pa.Type,
- "WrapNonExceptionThrows", Location.Null, TypeManager.bool_type);
+ "WrapNonExceptionThrows", Location.Null, TypeManager.bool_type).MetaInfo;
object [] pargs = new object [1];
pargs [0] = true;
- Builder.SetCustomAttribute (new CustomAttributeBuilder (ci, new object [0], pis, pargs));
+ Builder.SetCustomAttribute (new CustomAttributeBuilder ((ConstructorInfo) ci.GetMetaInfo (), new object[0], pis, pargs));
}
if (declarative_security != null) {
@@ -1532,16 +1394,17 @@ namespace Mono.CSharp {
try {
// Microsoft runtime hacking
if (add_permission == null) {
- Type assembly_builder = typeof (AssemblyBuilder).Assembly.GetType ("System.Reflection.Emit.AssemblyBuilderData");
+ var assembly_builder = typeof (AssemblyBuilder).Assembly.GetType ("System.Reflection.Emit.AssemblyBuilderData");
add_permission = assembly_builder.GetMethod ("AddPermissionRequests", BindingFlags.Instance | BindingFlags.NonPublic);
FieldInfo fi = typeof (AssemblyBuilder).GetField ("m_assemblyData", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.GetField);
builder_instance = fi.GetValue (Builder);
}
- object[] args = new object [] { declarative_security [SecurityAction.RequestMinimum],
- declarative_security [SecurityAction.RequestOptional],
- declarative_security [SecurityAction.RequestRefuse] };
+ var args = new PermissionSet [3];
+ declarative_security.TryGetValue (SecurityAction.RequestMinimum, out args [0]);
+ declarative_security.TryGetValue (SecurityAction.RequestOptional, out args [1]);
+ declarative_security.TryGetValue (SecurityAction.RequestRefuse, out args [2]);
add_permission.Invoke (builder_instance, args);
}
catch {