Inlining of static functions: applying Florian's CL.

tests/compiler/dart2js/source_mapping_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #import('dart:uri');
 
 #import("../../../lib/compiler/implementation/leg.dart");
 #import('../../../lib/compiler/implementation/source_file.dart');
 #import("mock_compiler.dart");
 #import('parser_helper.dart');
@@ skipping 33 matching lines @@
       String message = sourceFileWithMarkers.getLocationMessage(
           'Missing location', originalLocation, originalLocation + 1, true,
           (s) => s);
       Expect.fail(message);
     }
   }
 }
 
 String FUNCTIONS_TEST = '''
 @void main() { print(test(15)); @}
-@int test(int x) { return x; @}''';
+// The 'if' has been added to avoid inlining of 'test'.
+@int test(int x) { if (x != null) return x; else return null; @}''';
 
 String RETURN_TEST = 'void main() { print(((x) { @return x; })(0)); }';
 
 String NOT_TEST = 'void main() { ((x) { if (@!x) print(x); })(false); }';
 
 String UNARY_TEST = 'void main() { ((x, y) { print(@-x + @~y); })(1,2); }';
 
 String BINARY_TEST = 'void main() { ((x, y) { if (x @!== y) print(x @* y); })(1,2); }';
 
 String SEND_TEST = '''
 void main() {
   @staticSend(0);
   NewSend o = new @NewSend();
   @o.dynamicSend(0);
   var closureSend = (x) { print(x); };
   @closureSend(0);
 }
-void staticSend(x) { print(x); }
+// The 'if' has been added to avoid inlining of 'staticSend'.
+void staticSend(x) { if (x == null) return; print(x); }
 class NewSend { void dynamicSend(x) { print(x); } }
 ''';
 
 String LOOP_TEST = '''
 void main() {
   @for (int i = 0; i < 100; ++i) { print(test(13)); @}
 }
 int test(int x) {
   int result = 1; @while (result < x) { result <<= 1; @} return result;
 }''';
 
 
 main() {
   // These tests are fragile, since mappings for specific source locations
   // could disappear due to various optimizations like code elimination,
   // function inlining, etc. If you broke the test, please try to rewrite it
   // so that the new code is not optimized, otherwise just remove the marker
   // from problematic location.
   testSourceMapLocations(FUNCTIONS_TEST);
   testSourceMapLocations(RETURN_TEST);
   testSourceMapLocations(NOT_TEST);
   testSourceMapLocations(UNARY_TEST);
   testSourceMapLocations(BINARY_TEST);
   testSourceMapLocations(SEND_TEST);
   testSourceMapLocations(LOOP_TEST);
 }