From cc1d8cf395eebdf5e1f6e2f9ddb90111fbad95b7 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Dec 2015 13:47:18 -0800
Subject: [PATCH] Address review comments

---
 src/compiler/checker.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0f04daf2983..857fa97ca06 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5757,15 +5757,17 @@ namespace ts {
             }
 
             function enumRelatedTo(source: Type, target: Type) {
-                if (source.symbol.name !== target.symbol.name) {
+                if (source.symbol.name !== target.symbol.name ||
+                    source.symbol.flags & SymbolFlags.ConstEnum ||
+                    target.symbol.flags & SymbolFlags.ConstEnum) {
                     return Ternary.False;
                 }
-                const sourceDecl = <EnumDeclaration>getMergedSymbol(source.symbol).valueDeclaration;
-                const targetDecl = <EnumDeclaration>getMergedSymbol(target.symbol).valueDeclaration;
+                const sourceDecl = <EnumDeclaration>getDeclarationOfKind(source.symbol, SyntaxKind.EnumDeclaration);
+                const targetDecl = <EnumDeclaration>getDeclarationOfKind(target.symbol, SyntaxKind.EnumDeclaration);
                 const targetMembers = arrayToMap(targetDecl.members, member => getTextOfPropertyName(<PropertyName>member.name));
                 for (const member of sourceDecl.members) {
                     const name = getTextOfPropertyName(<PropertyName>member.name);
-                    if (!targetMembers[name]) {
+                    if (!hasProperty(targetMembers, name)) {
                         reportError(Diagnostics.Property_0_is_missing_in_type_1,
                                     name,
                                     typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType));