Don't overwrite orginal names that have already been set on node.

R=acleung DELTA=61 (54 added, 2 deleted, 5 changed) Revision created by MOE tool push_codebase. MOE_MIGRATION=1372 git-svn-id: https://closure-compiler.googlecode.com/svn/trunk@1000 b0f006be-c8cd-11de-a2e8-8d36a3108c74
0c3d7r4 · Apr 12, 2011 · f322be0 · f322be0
1 parent 8c4a625
commit f322be0
Show file tree

Hide file tree

Showing 663 changed files with 59 additions and 7 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
diff --git a/COPYING b/COPYING
diff --git a/README b/README
diff --git a/build.xml b/build.xml
diff --git a/closure-compiler.pom b/closure-compiler.pom
diff --git a/contrib/externs/chrome_extensions.js b/contrib/externs/chrome_extensions.js
diff --git a/contrib/externs/facebook_javascript_sdk.js b/contrib/externs/facebook_javascript_sdk.js
diff --git a/contrib/externs/google_analytics_api.js b/contrib/externs/google_analytics_api.js
diff --git a/contrib/externs/google_loader_api.js b/contrib/externs/google_loader_api.js
diff --git a/contrib/externs/google_maps_api_v2.js b/contrib/externs/google_maps_api_v2.js
diff --git a/contrib/externs/jquery-1.4.3.js b/contrib/externs/jquery-1.4.3.js
diff --git a/contrib/externs/jquery-1.4.4.js b/contrib/externs/jquery-1.4.4.js
diff --git a/contrib/externs/jquery-1.5.js b/contrib/externs/jquery-1.5.js
diff --git a/contrib/externs/json.js b/contrib/externs/json.js
diff --git a/contrib/externs/maps/google_maps_api_v3.js b/contrib/externs/maps/google_maps_api_v3.js
diff --git a/contrib/externs/maps/google_maps_api_v3_1.js b/contrib/externs/maps/google_maps_api_v3_1.js
diff --git a/contrib/externs/maps/google_maps_api_v3_2.js b/contrib/externs/maps/google_maps_api_v3_2.js
diff --git a/contrib/externs/maps/google_maps_api_v3_3.js b/contrib/externs/maps/google_maps_api_v3_3.js
diff --git a/contrib/externs/maps/google_maps_api_v3_4.js b/contrib/externs/maps/google_maps_api_v3_4.js
diff --git a/contrib/externs/silverlight.js b/contrib/externs/silverlight.js
diff --git a/contrib/externs/webkit_console.js b/contrib/externs/webkit_console.js
diff --git a/externs/deprecated.js b/externs/deprecated.js
diff --git a/externs/es3.js b/externs/es3.js
diff --git a/externs/es5.js b/externs/es5.js
diff --git a/externs/fileapi.js b/externs/fileapi.js
diff --git a/externs/flash.js b/externs/flash.js
diff --git a/externs/gears_symbols.js b/externs/gears_symbols.js
diff --git a/externs/gears_types.js b/externs/gears_types.js
diff --git a/externs/gecko_css.js b/externs/gecko_css.js
diff --git a/externs/gecko_dom.js b/externs/gecko_dom.js
diff --git a/externs/gecko_event.js b/externs/gecko_event.js
diff --git a/externs/gecko_xml.js b/externs/gecko_xml.js
diff --git a/externs/google.js b/externs/google.js
diff --git a/externs/html5.js b/externs/html5.js
diff --git a/externs/ie_css.js b/externs/ie_css.js
diff --git a/externs/ie_dom.js b/externs/ie_dom.js
diff --git a/externs/ie_event.js b/externs/ie_event.js
diff --git a/externs/ie_vml.js b/externs/ie_vml.js
diff --git a/externs/iphone.js b/externs/iphone.js
diff --git a/externs/w3c_css.js b/externs/w3c_css.js
diff --git a/externs/w3c_css3d.js b/externs/w3c_css3d.js
diff --git a/externs/w3c_dom1.js b/externs/w3c_dom1.js
diff --git a/externs/w3c_dom2.js b/externs/w3c_dom2.js
diff --git a/externs/w3c_dom3.js b/externs/w3c_dom3.js
diff --git a/externs/w3c_elementtraversal.js b/externs/w3c_elementtraversal.js
diff --git a/externs/w3c_event.js b/externs/w3c_event.js
diff --git a/externs/w3c_event3.js b/externs/w3c_event3.js
diff --git a/externs/w3c_geolocation.js b/externs/w3c_geolocation.js
diff --git a/externs/w3c_indexeddb.js b/externs/w3c_indexeddb.js
diff --git a/externs/w3c_range.js b/externs/w3c_range.js
diff --git a/externs/w3c_selectors.js b/externs/w3c_selectors.js
diff --git a/externs/w3c_xml.js b/externs/w3c_xml.js
diff --git a/externs/webgl.js b/externs/webgl.js
diff --git a/externs/webkit_css.js b/externs/webkit_css.js
diff --git a/externs/webkit_dom.js b/externs/webkit_dom.js
diff --git a/externs/webkit_event.js b/externs/webkit_event.js
diff --git a/externs/webkit_notifications.js b/externs/webkit_notifications.js
diff --git a/externs/webstorage.js b/externs/webstorage.js
diff --git a/externs/window.js b/externs/window.js
diff --git a/gen/com/google/debugging/sourcemap/proto/Mapping.java b/gen/com/google/debugging/sourcemap/proto/Mapping.java
diff --git a/gen/com/google/javascript/jscomp/FunctionInfo.java b/gen/com/google/javascript/jscomp/FunctionInfo.java
diff --git a/gen/com/google/javascript/jscomp/FunctionInformationMap.java b/gen/com/google/javascript/jscomp/FunctionInformationMap.java
diff --git a/gen/com/google/javascript/jscomp/Instrumentation.java b/gen/com/google/javascript/jscomp/Instrumentation.java
diff --git a/gen/com/google/javascript/jscomp/InstrumentationTemplate.java b/gen/com/google/javascript/jscomp/InstrumentationTemplate.java
diff --git a/lib/ant-launcher.jar b/lib/ant-launcher.jar
diff --git a/lib/ant.jar b/lib/ant.jar
diff --git a/lib/args4j.jar b/lib/args4j.jar
diff --git a/lib/caja-r4314.jar b/lib/caja-r4314.jar
diff --git a/lib/guava.jar b/lib/guava.jar
diff --git a/lib/json.jar b/lib/json.jar
diff --git a/lib/jsr305.jar b/lib/jsr305.jar
diff --git a/lib/junit.jar b/lib/junit.jar
diff --git a/lib/protobuf-java.jar b/lib/protobuf-java.jar
diff --git a/src/com/google/debugging/sourcemap/FilePosition.java b/src/com/google/debugging/sourcemap/FilePosition.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapConsumer.java b/src/com/google/debugging/sourcemap/SourceMapConsumer.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapConsumerFactory.java b/src/com/google/debugging/sourcemap/SourceMapConsumerFactory.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapConsumerV1.java b/src/com/google/debugging/sourcemap/SourceMapConsumerV1.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapConsumerV2.java b/src/com/google/debugging/sourcemap/SourceMapConsumerV2.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapFormat.java b/src/com/google/debugging/sourcemap/SourceMapFormat.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapGenerator.java b/src/com/google/debugging/sourcemap/SourceMapGenerator.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapGeneratorFactory.java b/src/com/google/debugging/sourcemap/SourceMapGeneratorFactory.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapGeneratorV1.java b/src/com/google/debugging/sourcemap/SourceMapGeneratorV1.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapGeneratorV2.java b/src/com/google/debugging/sourcemap/SourceMapGeneratorV2.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapLineDecoder.java b/src/com/google/debugging/sourcemap/SourceMapLineDecoder.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapParseException.java b/src/com/google/debugging/sourcemap/SourceMapParseException.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapSection.java b/src/com/google/debugging/sourcemap/SourceMapSection.java
diff --git a/src/com/google/debugging/sourcemap/SourceMapping.java b/src/com/google/debugging/sourcemap/SourceMapping.java
diff --git a/src/com/google/debugging/sourcemap/Util.java b/src/com/google/debugging/sourcemap/Util.java
diff --git a/src/com/google/debugging/sourcemap/package.html b/src/com/google/debugging/sourcemap/package.html
diff --git a/src/com/google/javascript/jscomp/AbstractCommandLineRunner.java b/src/com/google/javascript/jscomp/AbstractCommandLineRunner.java
diff --git a/src/com/google/javascript/jscomp/AbstractCompiler.java b/src/com/google/javascript/jscomp/AbstractCompiler.java
diff --git a/src/com/google/javascript/jscomp/AbstractMessageFormatter.java b/src/com/google/javascript/jscomp/AbstractMessageFormatter.java
diff --git a/src/com/google/javascript/jscomp/AbstractPeepholeOptimization.java b/src/com/google/javascript/jscomp/AbstractPeepholeOptimization.java
diff --git a/src/com/google/javascript/jscomp/AliasExternals.java b/src/com/google/javascript/jscomp/AliasExternals.java
diff --git a/src/com/google/javascript/jscomp/AliasKeywords.java b/src/com/google/javascript/jscomp/AliasKeywords.java
diff --git a/src/com/google/javascript/jscomp/AliasStrings.java b/src/com/google/javascript/jscomp/AliasStrings.java
diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java
diff --git a/src/com/google/javascript/jscomp/AnalyzeNameReferences.java b/src/com/google/javascript/jscomp/AnalyzeNameReferences.java
diff --git a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java
diff --git a/src/com/google/javascript/jscomp/AnonymousFunctionNamingCallback.java b/src/com/google/javascript/jscomp/AnonymousFunctionNamingCallback.java
diff --git a/src/com/google/javascript/jscomp/AnonymousFunctionNamingPolicy.java b/src/com/google/javascript/jscomp/AnonymousFunctionNamingPolicy.java
diff --git a/src/com/google/javascript/jscomp/AstChangeProxy.java b/src/com/google/javascript/jscomp/AstChangeProxy.java
diff --git a/src/com/google/javascript/jscomp/AstParallelizer.java b/src/com/google/javascript/jscomp/AstParallelizer.java
diff --git a/src/com/google/javascript/jscomp/AstValidator.java b/src/com/google/javascript/jscomp/AstValidator.java
diff --git a/src/com/google/javascript/jscomp/BasicErrorManager.java b/src/com/google/javascript/jscomp/BasicErrorManager.java
diff --git a/src/com/google/javascript/jscomp/CallGraph.java b/src/com/google/javascript/jscomp/CallGraph.java
diff --git a/src/com/google/javascript/jscomp/ChainCalls.java b/src/com/google/javascript/jscomp/ChainCalls.java
diff --git a/src/com/google/javascript/jscomp/ChainableReverseAbstractInterpreter.java b/src/com/google/javascript/jscomp/ChainableReverseAbstractInterpreter.java
diff --git a/src/com/google/javascript/jscomp/CheckAccessControls.java b/src/com/google/javascript/jscomp/CheckAccessControls.java
diff --git a/src/com/google/javascript/jscomp/CheckAccidentalSemicolon.java b/src/com/google/javascript/jscomp/CheckAccidentalSemicolon.java
diff --git a/src/com/google/javascript/jscomp/CheckGlobalNames.java b/src/com/google/javascript/jscomp/CheckGlobalNames.java
diff --git a/src/com/google/javascript/jscomp/CheckGlobalThis.java b/src/com/google/javascript/jscomp/CheckGlobalThis.java
diff --git a/src/com/google/javascript/jscomp/CheckLevel.java b/src/com/google/javascript/jscomp/CheckLevel.java
diff --git a/src/com/google/javascript/jscomp/CheckLevelLegacy.java b/src/com/google/javascript/jscomp/CheckLevelLegacy.java
diff --git a/src/com/google/javascript/jscomp/CheckMissingGetCssName.java b/src/com/google/javascript/jscomp/CheckMissingGetCssName.java
diff --git a/src/com/google/javascript/jscomp/CheckMissingReturn.java b/src/com/google/javascript/jscomp/CheckMissingReturn.java
diff --git a/src/com/google/javascript/jscomp/CheckPathsBetweenNodes.java b/src/com/google/javascript/jscomp/CheckPathsBetweenNodes.java
diff --git a/src/com/google/javascript/jscomp/CheckPropertyOrder.java b/src/com/google/javascript/jscomp/CheckPropertyOrder.java
diff --git a/src/com/google/javascript/jscomp/CheckProvides.java b/src/com/google/javascript/jscomp/CheckProvides.java
diff --git a/src/com/google/javascript/jscomp/CheckRegExp.java b/src/com/google/javascript/jscomp/CheckRegExp.java
diff --git a/src/com/google/javascript/jscomp/CheckRequiresForConstructors.java b/src/com/google/javascript/jscomp/CheckRequiresForConstructors.java
diff --git a/src/com/google/javascript/jscomp/CheckSideEffects.java b/src/com/google/javascript/jscomp/CheckSideEffects.java
diff --git a/src/com/google/javascript/jscomp/CheckUnreachableCode.java b/src/com/google/javascript/jscomp/CheckUnreachableCode.java
diff --git a/src/com/google/javascript/jscomp/ClosureCodeRemoval.java b/src/com/google/javascript/jscomp/ClosureCodeRemoval.java
diff --git a/src/com/google/javascript/jscomp/ClosureCodingConvention.java b/src/com/google/javascript/jscomp/ClosureCodingConvention.java
diff --git a/src/com/google/javascript/jscomp/ClosureReverseAbstractInterpreter.java b/src/com/google/javascript/jscomp/ClosureReverseAbstractInterpreter.java
diff --git a/src/com/google/javascript/jscomp/CoalesceVariableNames.java b/src/com/google/javascript/jscomp/CoalesceVariableNames.java
diff --git a/src/com/google/javascript/jscomp/CodeChangeHandler.java b/src/com/google/javascript/jscomp/CodeChangeHandler.java
diff --git a/src/com/google/javascript/jscomp/CodeConsumer.java b/src/com/google/javascript/jscomp/CodeConsumer.java
diff --git a/src/com/google/javascript/jscomp/CodeGenerator.java b/src/com/google/javascript/jscomp/CodeGenerator.java
diff --git a/src/com/google/javascript/jscomp/CodePrinter.java b/src/com/google/javascript/jscomp/CodePrinter.java
diff --git a/src/com/google/javascript/jscomp/CodingConvention.java b/src/com/google/javascript/jscomp/CodingConvention.java
diff --git a/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java b/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java
diff --git a/src/com/google/javascript/jscomp/CollapseProperties.java b/src/com/google/javascript/jscomp/CollapseProperties.java
diff --git a/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java b/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java
diff --git a/src/com/google/javascript/jscomp/CombinedCompilerPass.java b/src/com/google/javascript/jscomp/CombinedCompilerPass.java
diff --git a/src/com/google/javascript/jscomp/CommandLineRunner.java b/src/com/google/javascript/jscomp/CommandLineRunner.java
diff --git a/src/com/google/javascript/jscomp/CompilationLevel.java b/src/com/google/javascript/jscomp/CompilationLevel.java
diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java
diff --git a/src/com/google/javascript/jscomp/CompilerInput.java b/src/com/google/javascript/jscomp/CompilerInput.java
diff --git a/src/com/google/javascript/jscomp/CompilerOptions.java b/src/com/google/javascript/jscomp/CompilerOptions.java
diff --git a/src/com/google/javascript/jscomp/CompilerPass.java b/src/com/google/javascript/jscomp/CompilerPass.java
diff --git a/src/com/google/javascript/jscomp/ComposeWarningsGuard.java b/src/com/google/javascript/jscomp/ComposeWarningsGuard.java
diff --git a/src/com/google/javascript/jscomp/ConcreteType.java b/src/com/google/javascript/jscomp/ConcreteType.java
diff --git a/src/com/google/javascript/jscomp/ConstCheck.java b/src/com/google/javascript/jscomp/ConstCheck.java
diff --git a/src/com/google/javascript/jscomp/ControlFlowAnalysis.java b/src/com/google/javascript/jscomp/ControlFlowAnalysis.java
diff --git a/src/com/google/javascript/jscomp/ControlFlowGraph.java b/src/com/google/javascript/jscomp/ControlFlowGraph.java
diff --git a/src/com/google/javascript/jscomp/ControlStructureCheck.java b/src/com/google/javascript/jscomp/ControlStructureCheck.java
diff --git a/src/com/google/javascript/jscomp/ConvertToDottedProperties.java b/src/com/google/javascript/jscomp/ConvertToDottedProperties.java
diff --git a/src/com/google/javascript/jscomp/CreateSyntheticBlocks.java b/src/com/google/javascript/jscomp/CreateSyntheticBlocks.java
diff --git a/src/com/google/javascript/jscomp/CrossModuleMethodMotion.java b/src/com/google/javascript/jscomp/CrossModuleMethodMotion.java
diff --git a/src/com/google/javascript/jscomp/CssRenamingMap.java b/src/com/google/javascript/jscomp/CssRenamingMap.java
diff --git a/src/com/google/javascript/jscomp/CustomPassExecutionTime.java b/src/com/google/javascript/jscomp/CustomPassExecutionTime.java
diff --git a/src/com/google/javascript/jscomp/DataFlowAnalysis.java b/src/com/google/javascript/jscomp/DataFlowAnalysis.java
diff --git a/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java b/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java
diff --git a/src/com/google/javascript/jscomp/DefaultCodingConvention.java b/src/com/google/javascript/jscomp/DefaultCodingConvention.java
diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java
diff --git a/src/com/google/javascript/jscomp/DefinitionProvider.java b/src/com/google/javascript/jscomp/DefinitionProvider.java
diff --git a/src/com/google/javascript/jscomp/DefinitionSite.java b/src/com/google/javascript/jscomp/DefinitionSite.java
diff --git a/src/com/google/javascript/jscomp/DefinitionsRemover.java b/src/com/google/javascript/jscomp/DefinitionsRemover.java
diff --git a/src/com/google/javascript/jscomp/Denormalize.java b/src/com/google/javascript/jscomp/Denormalize.java
diff --git a/src/com/google/javascript/jscomp/DevirtualizePrototypeMethods.java b/src/com/google/javascript/jscomp/DevirtualizePrototypeMethods.java
diff --git a/src/com/google/javascript/jscomp/DiagnosticGroup.java b/src/com/google/javascript/jscomp/DiagnosticGroup.java
diff --git a/src/com/google/javascript/jscomp/DiagnosticGroupWarningsGuard.java b/src/com/google/javascript/jscomp/DiagnosticGroupWarningsGuard.java
diff --git a/src/com/google/javascript/jscomp/DiagnosticGroups.java b/src/com/google/javascript/jscomp/DiagnosticGroups.java
diff --git a/src/com/google/javascript/jscomp/DiagnosticType.java b/src/com/google/javascript/jscomp/DiagnosticType.java
diff --git a/src/com/google/javascript/jscomp/DisambiguateProperties.java b/src/com/google/javascript/jscomp/DisambiguateProperties.java
diff --git a/src/com/google/javascript/jscomp/DotFormatter.java b/src/com/google/javascript/jscomp/DotFormatter.java
diff --git a/src/com/google/javascript/jscomp/ErrorFormat.java b/src/com/google/javascript/jscomp/ErrorFormat.java
diff --git a/src/com/google/javascript/jscomp/ErrorManager.java b/src/com/google/javascript/jscomp/ErrorManager.java
diff --git a/src/com/google/javascript/jscomp/ErrorPass.java b/src/com/google/javascript/jscomp/ErrorPass.java
diff --git a/src/com/google/javascript/jscomp/ExploitAssigns.java b/src/com/google/javascript/jscomp/ExploitAssigns.java
diff --git a/src/com/google/javascript/jscomp/ExportTestFunctions.java b/src/com/google/javascript/jscomp/ExportTestFunctions.java
diff --git a/src/com/google/javascript/jscomp/ExpressionDecomposer.java b/src/com/google/javascript/jscomp/ExpressionDecomposer.java
diff --git a/src/com/google/javascript/jscomp/ExternExportsPass.java b/src/com/google/javascript/jscomp/ExternExportsPass.java
diff --git a/src/com/google/javascript/jscomp/ExtractPrototypeMemberDeclarations.java b/src/com/google/javascript/jscomp/ExtractPrototypeMemberDeclarations.java
diff --git a/src/com/google/javascript/jscomp/FindExportableNodes.java b/src/com/google/javascript/jscomp/FindExportableNodes.java
diff --git a/src/com/google/javascript/jscomp/FlowScope.java b/src/com/google/javascript/jscomp/FlowScope.java
diff --git a/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java b/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java
diff --git a/src/com/google/javascript/jscomp/FunctionArgumentInjector.java b/src/com/google/javascript/jscomp/FunctionArgumentInjector.java
diff --git a/src/com/google/javascript/jscomp/FunctionInjector.java b/src/com/google/javascript/jscomp/FunctionInjector.java
diff --git a/src/com/google/javascript/jscomp/FunctionNames.java b/src/com/google/javascript/jscomp/FunctionNames.java
diff --git a/src/com/google/javascript/jscomp/FunctionRewriter.java b/src/com/google/javascript/jscomp/FunctionRewriter.java
diff --git a/src/com/google/javascript/jscomp/FunctionToBlockMutator.java b/src/com/google/javascript/jscomp/FunctionToBlockMutator.java
diff --git a/src/com/google/javascript/jscomp/FunctionTypeBuilder.java b/src/com/google/javascript/jscomp/FunctionTypeBuilder.java
diff --git a/src/com/google/javascript/jscomp/GatherRawExports.java b/src/com/google/javascript/jscomp/GatherRawExports.java
diff --git a/src/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallback.java b/src/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallback.java
diff --git a/src/com/google/javascript/jscomp/GenerateExports.java b/src/com/google/javascript/jscomp/GenerateExports.java
diff --git a/src/com/google/javascript/jscomp/GlobalNamespace.java b/src/com/google/javascript/jscomp/GlobalNamespace.java
diff --git a/src/com/google/javascript/jscomp/GoogleCodingConvention.java b/src/com/google/javascript/jscomp/GoogleCodingConvention.java
diff --git a/src/com/google/javascript/jscomp/GroupVariableDeclarations.java b/src/com/google/javascript/jscomp/GroupVariableDeclarations.java
diff --git a/src/com/google/javascript/jscomp/IgnoreCajaProperties.java b/src/com/google/javascript/jscomp/IgnoreCajaProperties.java
diff --git a/src/com/google/javascript/jscomp/InferJSDocInfo.java b/src/com/google/javascript/jscomp/InferJSDocInfo.java
diff --git a/src/com/google/javascript/jscomp/InlineCostEstimator.java b/src/com/google/javascript/jscomp/InlineCostEstimator.java
diff --git a/src/com/google/javascript/jscomp/InlineFunctions.java b/src/com/google/javascript/jscomp/InlineFunctions.java
diff --git a/src/com/google/javascript/jscomp/InlineSimpleMethods.java b/src/com/google/javascript/jscomp/InlineSimpleMethods.java
diff --git a/src/com/google/javascript/jscomp/InlineVariables.java b/src/com/google/javascript/jscomp/InlineVariables.java
diff --git a/src/com/google/javascript/jscomp/InstrumentFunctions.java b/src/com/google/javascript/jscomp/InstrumentFunctions.java
diff --git a/src/com/google/javascript/jscomp/InvocationsCallback.java b/src/com/google/javascript/jscomp/InvocationsCallback.java
diff --git a/src/com/google/javascript/jscomp/JSError.java b/src/com/google/javascript/jscomp/JSError.java
diff --git a/src/com/google/javascript/jscomp/JSModule.java b/src/com/google/javascript/jscomp/JSModule.java
diff --git a/src/com/google/javascript/jscomp/JSModuleGraph.java b/src/com/google/javascript/jscomp/JSModuleGraph.java
diff --git a/src/com/google/javascript/jscomp/JSSourceFile.java b/src/com/google/javascript/jscomp/JSSourceFile.java
diff --git a/src/com/google/javascript/jscomp/JoinOp.java b/src/com/google/javascript/jscomp/JoinOp.java
diff --git a/src/com/google/javascript/jscomp/JsAst.java b/src/com/google/javascript/jscomp/JsAst.java
diff --git a/src/com/google/javascript/jscomp/JsMessage.java b/src/com/google/javascript/jscomp/JsMessage.java
diff --git a/src/com/google/javascript/jscomp/JsMessageDefinition.java b/src/com/google/javascript/jscomp/JsMessageDefinition.java
diff --git a/src/com/google/javascript/jscomp/JsMessageExtractor.java b/src/com/google/javascript/jscomp/JsMessageExtractor.java
diff --git a/src/com/google/javascript/jscomp/JsMessageVisitor.java b/src/com/google/javascript/jscomp/JsMessageVisitor.java
diff --git a/src/com/google/javascript/jscomp/LatticeElement.java b/src/com/google/javascript/jscomp/LatticeElement.java
diff --git a/src/com/google/javascript/jscomp/LightweightMessageFormatter.java b/src/com/google/javascript/jscomp/LightweightMessageFormatter.java
diff --git a/src/com/google/javascript/jscomp/LineNumberCheck.java b/src/com/google/javascript/jscomp/LineNumberCheck.java
diff --git a/src/com/google/javascript/jscomp/LinkedFlowScope.java b/src/com/google/javascript/jscomp/LinkedFlowScope.java
diff --git a/src/com/google/javascript/jscomp/LiveVariablesAnalysis.java b/src/com/google/javascript/jscomp/LiveVariablesAnalysis.java
diff --git a/src/com/google/javascript/jscomp/LocaleUtil.java b/src/com/google/javascript/jscomp/LocaleUtil.java
diff --git a/src/com/google/javascript/jscomp/LoggerErrorManager.java b/src/com/google/javascript/jscomp/LoggerErrorManager.java
diff --git a/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java b/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java
diff --git a/src/com/google/javascript/jscomp/MarkNoSideEffectCalls.java b/src/com/google/javascript/jscomp/MarkNoSideEffectCalls.java
diff --git a/src/com/google/javascript/jscomp/MaybeReachingVariableUse.java b/src/com/google/javascript/jscomp/MaybeReachingVariableUse.java
diff --git a/src/com/google/javascript/jscomp/MemoizedScopeCreator.java b/src/com/google/javascript/jscomp/MemoizedScopeCreator.java
diff --git a/src/com/google/javascript/jscomp/MessageBundle.java b/src/com/google/javascript/jscomp/MessageBundle.java
diff --git a/src/com/google/javascript/jscomp/MessageFormatter.java b/src/com/google/javascript/jscomp/MessageFormatter.java
diff --git a/src/com/google/javascript/jscomp/MethodCompilerPass.java b/src/com/google/javascript/jscomp/MethodCompilerPass.java
diff --git a/src/com/google/javascript/jscomp/MinimizeExitPoints.java b/src/com/google/javascript/jscomp/MinimizeExitPoints.java
diff --git a/src/com/google/javascript/jscomp/MoveFunctionDeclarations.java b/src/com/google/javascript/jscomp/MoveFunctionDeclarations.java
diff --git a/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java b/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java
diff --git a/src/com/google/javascript/jscomp/NameAnalyzer.java b/src/com/google/javascript/jscomp/NameAnalyzer.java
diff --git a/src/com/google/javascript/jscomp/NameAnonymousFunctions.java b/src/com/google/javascript/jscomp/NameAnonymousFunctions.java
diff --git a/src/com/google/javascript/jscomp/NameAnonymousFunctionsMapped.java b/src/com/google/javascript/jscomp/NameAnonymousFunctionsMapped.java
diff --git a/src/com/google/javascript/jscomp/NameGenerator.java b/src/com/google/javascript/jscomp/NameGenerator.java
diff --git a/src/com/google/javascript/jscomp/NameReferenceGraph.java b/src/com/google/javascript/jscomp/NameReferenceGraph.java
diff --git a/src/com/google/javascript/jscomp/NameReferenceGraphConstruction.java b/src/com/google/javascript/jscomp/NameReferenceGraphConstruction.java
diff --git a/src/com/google/javascript/jscomp/NameReferenceGraphReport.java b/src/com/google/javascript/jscomp/NameReferenceGraphReport.java
diff --git a/src/com/google/javascript/jscomp/NodeIterators.java b/src/com/google/javascript/jscomp/NodeIterators.java
diff --git a/src/com/google/javascript/jscomp/NodeNameExtractor.java b/src/com/google/javascript/jscomp/NodeNameExtractor.java
diff --git a/src/com/google/javascript/jscomp/NodeTraversal.java b/src/com/google/javascript/jscomp/NodeTraversal.java
diff --git a/src/com/google/javascript/jscomp/NodeUtil.java b/src/com/google/javascript/jscomp/NodeUtil.java
diff --git a/src/com/google/javascript/jscomp/Normalize.java b/src/com/google/javascript/jscomp/Normalize.java
diff --git a/src/com/google/javascript/jscomp/ObjectPropertyStringPostprocess.java b/src/com/google/javascript/jscomp/ObjectPropertyStringPostprocess.java
diff --git a/src/com/google/javascript/jscomp/ObjectPropertyStringPreprocess.java b/src/com/google/javascript/jscomp/ObjectPropertyStringPreprocess.java
diff --git a/src/com/google/javascript/jscomp/OperaCompoundAssignFix.java b/src/com/google/javascript/jscomp/OperaCompoundAssignFix.java
diff --git a/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java b/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java
diff --git a/src/com/google/javascript/jscomp/OptimizeCalls.java b/src/com/google/javascript/jscomp/OptimizeCalls.java
diff --git a/src/com/google/javascript/jscomp/OptimizeParameters.java b/src/com/google/javascript/jscomp/OptimizeParameters.java
diff --git a/src/com/google/javascript/jscomp/OptimizeReturns.java b/src/com/google/javascript/jscomp/OptimizeReturns.java
diff --git a/src/com/google/javascript/jscomp/ParallelCompilerPass.java b/src/com/google/javascript/jscomp/ParallelCompilerPass.java
diff --git a/src/com/google/javascript/jscomp/PassConfig.java b/src/com/google/javascript/jscomp/PassConfig.java
diff --git a/src/com/google/javascript/jscomp/PassFactory.java b/src/com/google/javascript/jscomp/PassFactory.java
diff --git a/src/com/google/javascript/jscomp/PeepholeCollectPropertyAssignments.java b/src/com/google/javascript/jscomp/PeepholeCollectPropertyAssignments.java
diff --git a/src/com/google/javascript/jscomp/PeepholeFoldConstants.java b/src/com/google/javascript/jscomp/PeepholeFoldConstants.java
diff --git a/src/com/google/javascript/jscomp/PeepholeFoldWithTypes.java b/src/com/google/javascript/jscomp/PeepholeFoldWithTypes.java
diff --git a/src/com/google/javascript/jscomp/PeepholeOptimizationsPass.java b/src/com/google/javascript/jscomp/PeepholeOptimizationsPass.java
diff --git a/src/com/google/javascript/jscomp/PeepholeRemoveDeadCode.java b/src/com/google/javascript/jscomp/PeepholeRemoveDeadCode.java
diff --git a/src/com/google/javascript/jscomp/PeepholeSubstituteAlternateSyntax.java b/src/com/google/javascript/jscomp/PeepholeSubstituteAlternateSyntax.java
diff --git a/src/com/google/javascript/jscomp/PerformanceTracker.java b/src/com/google/javascript/jscomp/PerformanceTracker.java
diff --git a/src/com/google/javascript/jscomp/PhaseOptimizer.java b/src/com/google/javascript/jscomp/PhaseOptimizer.java
diff --git a/src/com/google/javascript/jscomp/PrepareAst.java b/src/com/google/javascript/jscomp/PrepareAst.java
diff --git a/src/com/google/javascript/jscomp/PrintStreamErrorManager.java b/src/com/google/javascript/jscomp/PrintStreamErrorManager.java
diff --git a/src/com/google/javascript/jscomp/ProcessClosurePrimitives.java b/src/com/google/javascript/jscomp/ProcessClosurePrimitives.java
diff --git a/src/com/google/javascript/jscomp/ProcessDefines.java b/src/com/google/javascript/jscomp/ProcessDefines.java
diff --git a/src/com/google/javascript/jscomp/ProcessTweaks.java b/src/com/google/javascript/jscomp/ProcessTweaks.java
diff --git a/src/com/google/javascript/jscomp/PropertyRenamingPolicy.java b/src/com/google/javascript/jscomp/PropertyRenamingPolicy.java
diff --git a/src/com/google/javascript/jscomp/PureFunctionIdentifier.java b/src/com/google/javascript/jscomp/PureFunctionIdentifier.java
diff --git a/src/com/google/javascript/jscomp/RecordFunctionInformation.java b/src/com/google/javascript/jscomp/RecordFunctionInformation.java
diff --git a/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java b/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java
diff --git a/src/com/google/javascript/jscomp/Region.java b/src/com/google/javascript/jscomp/Region.java
diff --git a/src/com/google/javascript/jscomp/RemoveTryCatch.java b/src/com/google/javascript/jscomp/RemoveTryCatch.java
diff --git a/src/com/google/javascript/jscomp/RemoveUnusedNames.java b/src/com/google/javascript/jscomp/RemoveUnusedNames.java
diff --git a/src/com/google/javascript/jscomp/RemoveUnusedPrototypeProperties.java b/src/com/google/javascript/jscomp/RemoveUnusedPrototypeProperties.java
diff --git a/src/com/google/javascript/jscomp/RemoveUnusedVars.java b/src/com/google/javascript/jscomp/RemoveUnusedVars.java
diff --git a/src/com/google/javascript/jscomp/RenameLabels.java b/src/com/google/javascript/jscomp/RenameLabels.java
diff --git a/src/com/google/javascript/jscomp/RenameProperties.java b/src/com/google/javascript/jscomp/RenameProperties.java
diff --git a/src/com/google/javascript/jscomp/RenamePrototypes.java b/src/com/google/javascript/jscomp/RenamePrototypes.java
diff --git a/src/com/google/javascript/jscomp/RenameVars.java b/src/com/google/javascript/jscomp/RenameVars.java
diff --git a/src/com/google/javascript/jscomp/ReplaceCssNames.java b/src/com/google/javascript/jscomp/ReplaceCssNames.java
diff --git a/src/com/google/javascript/jscomp/ReplaceIdGenerators.java b/src/com/google/javascript/jscomp/ReplaceIdGenerators.java
diff --git a/src/com/google/javascript/jscomp/ReplaceMessages.java b/src/com/google/javascript/jscomp/ReplaceMessages.java
diff --git a/src/com/google/javascript/jscomp/ReplaceStrings.java b/src/com/google/javascript/jscomp/ReplaceStrings.java
diff --git a/src/com/google/javascript/jscomp/Result.java b/src/com/google/javascript/jscomp/Result.java
diff --git a/src/com/google/javascript/jscomp/ReverseAbstractInterpreter.java b/src/com/google/javascript/jscomp/ReverseAbstractInterpreter.java
diff --git a/src/com/google/javascript/jscomp/RhinoErrorReporter.java b/src/com/google/javascript/jscomp/RhinoErrorReporter.java
diff --git a/src/com/google/javascript/jscomp/RuntimeTypeCheck.java b/src/com/google/javascript/jscomp/RuntimeTypeCheck.java
diff --git a/src/com/google/javascript/jscomp/SanityCheck.java b/src/com/google/javascript/jscomp/SanityCheck.java
diff --git a/src/com/google/javascript/jscomp/Scope.java b/src/com/google/javascript/jscomp/Scope.java
diff --git a/src/com/google/javascript/jscomp/ScopeCreator.java b/src/com/google/javascript/jscomp/ScopeCreator.java
diff --git a/src/com/google/javascript/jscomp/ScopedAliases.java b/src/com/google/javascript/jscomp/ScopedAliases.java
diff --git a/src/com/google/javascript/jscomp/SemanticReverseAbstractInterpreter.java b/src/com/google/javascript/jscomp/SemanticReverseAbstractInterpreter.java
diff --git a/src/com/google/javascript/jscomp/ShadowVariables.java b/src/com/google/javascript/jscomp/ShadowVariables.java
diff --git a/src/com/google/javascript/jscomp/ShowByPathWarningsGuard.java b/src/com/google/javascript/jscomp/ShowByPathWarningsGuard.java
diff --git a/src/com/google/javascript/jscomp/SideEffectsAnalysis.java b/src/com/google/javascript/jscomp/SideEffectsAnalysis.java
diff --git a/src/com/google/javascript/jscomp/SimpleDefinitionFinder.java b/src/com/google/javascript/jscomp/SimpleDefinitionFinder.java
diff --git a/src/com/google/javascript/jscomp/SimpleFunctionAliasAnalysis.java b/src/com/google/javascript/jscomp/SimpleFunctionAliasAnalysis.java
diff --git a/src/com/google/javascript/jscomp/SimpleRegion.java b/src/com/google/javascript/jscomp/SimpleRegion.java
diff --git a/src/com/google/javascript/jscomp/SourceAst.java b/src/com/google/javascript/jscomp/SourceAst.java
diff --git a/src/com/google/javascript/jscomp/SourceExcerptProvider.java b/src/com/google/javascript/jscomp/SourceExcerptProvider.java
diff --git a/src/com/google/javascript/jscomp/SourceFile.java b/src/com/google/javascript/jscomp/SourceFile.java
diff --git a/src/com/google/javascript/jscomp/SourceInformationAnnotator.java b/src/com/google/javascript/jscomp/SourceInformationAnnotator.java
@@ -61,32 +61,36 @@ public void visit(NodeTraversal t, Node n, Node parent) {
     // Annotate the original name.
     switch (n.getType()) {
       case Token.GETPROP:
-        Node propNode = n.getFirstChild().getNext();
-        if (propNode.getType() == Token.STRING) {
-          n.putProp(Node.ORIGINALNAME_PROP, propNode.getString());
-        }
+        Node propNode = n.getLastChild();
+        setOriginalName(n, propNode.getString());
         break;
 
       case Token.FUNCTION:
         String functionName = NodeUtil.getNearestFunctionName(n);
         if (functionName != null) {
-          n.putProp(Node.ORIGINALNAME_PROP, functionName);
+          setOriginalName(n, functionName);
         }
         break;
 
       case Token.NAME:
-        n.putProp(Node.ORIGINALNAME_PROP, n.getString());
+        setOriginalName(n, n.getString());
         break;
 
       case Token.OBJECTLIT:
         for (Node key = n.getFirstChild(); key != null;
              key = key.getNext()) {
            // We only want keys were unquoted.
            if (!key.isQuotedString()) {
-             key.putProp(Node.ORIGINALNAME_PROP, key.getString());
+             setOriginalName(key, key.getString());
            }
          }
         break;
     }
   }
+
+  void setOriginalName(Node n, String name) {
+    if (!name.isEmpty() && n.getProp(Node.ORIGINALNAME_PROP) == null) {
+      n.putProp(Node.ORIGINALNAME_PROP, name);
+    }
+  }
 }
diff --git a/src/com/google/javascript/jscomp/SourceMap.java b/src/com/google/javascript/jscomp/SourceMap.java