--- a/.hgignore	Fri Dec 19 14:38:40 2014 +0100
+++ b/.hgignore	Fri Dec 19 14:58:50 2014 +0100
@@ -29,6 +29,8 @@
 \.csv$
 \.iml$
 \.swp$
+\.swn$
+\.swo$
 \.class$
 \.log$
 \.bak$

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.phases.common.test/src/com/oracle/graal/phases/common/test/StampFactoryTest.java	Fri Dec 19 14:58:50 2014 +0100
@@ -0,0 +1,50 @@
+package com.oracle.graal.phases.common.test;
+
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.*;
+
+import org.junit.*;
+
+import com.oracle.graal.api.meta.*;
+import com.oracle.graal.api.runtime.*;
+import com.oracle.graal.compiler.common.type.*;
+import com.oracle.graal.runtime.*;
+
+public class StampFactoryTest {
+
+    @SuppressWarnings("unused")
+    public void test(int a, Object b, double c) {
+    }
+
+    @Test
+    public void testParameters() throws NoSuchMethodException, SecurityException {
+        Method method = StampFactoryTest.class.getMethod("test", Integer.TYPE, Object.class, Double.TYPE);
+        MetaAccessProvider metaAccess = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getProviders().getMetaAccess();
+        Stamp[] parameterStamps = StampFactory.createParameterStamps(metaAccess.lookupJavaMethod(method));
+        Stamp[] expected = {StampFactory.declaredNonNull(metaAccess.lookupJavaType(StampFactoryTest.class)), StampFactory.forKind(Kind.Int),
+                        StampFactory.declared(metaAccess.lookupJavaType(Object.class)), StampFactory.forKind(Kind.Double)};
+        Assert.assertArrayEquals(expected, parameterStamps);
+    }
+}

--- a/mx/suite.py	Fri Dec 19 14:38:40 2014 +0100
+++ b/mx/suite.py	Fri Dec 19 14:58:50 2014 +0100
@@ -716,6 +716,19 @@
       "workingSets" : "Graal,Phases",
     },
 
+    "com.oracle.graal.phases.common.test" : {
+      "subDir" : "graal",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "com.oracle.graal.phases.common",
+        "com.oracle.graal.runtime",
+        "JUNIT",
+      ],
+      "checkstyle" : "com.oracle.graal.graph",
+      "javaCompliance" : "1.8",
+      "workingSets" : "Graal,Test",
+    },
+
     "com.oracle.graal.virtual" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],