Push bleeding_edge r1758 and r1764 to trunk....

test/mjsunit/string-replace.js

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 86 matching lines @@
 replaceTest("[]axbxcx", short, /x()/, "[$1]");
 replaceTest("[$1]a[$1]b[$1]c[$1]", short, /x/g, "[$1]");
 replaceTest("[]a[]b[]c[]", short, /x()/g, "[$1]");
 
 replaceTest("xax[$1]xcx", short, "b", "[$1]");
 replaceTest("xax[$1]xcx", short, /b/, "[$1]");
 replaceTest("xax[]xcx", short, /b()/, "[$1]");
 replaceTest("xax[$1]xcx", short, /b/g, "[$1]");
 replaceTest("xax[]xcx", short, /b()/g, "[$1]");
 
+// Bug 317 look-alikes. If "$e" has no meaning, the "$" must be retained.
+replaceTest("xax$excx", short, "b", "$e");
+replaceTest("xax$excx", short, /b/, "$e");
+replaceTest("xax$excx", short, /b/g, "$e");
+
+replaceTest("xaxe$xcx", short, "b", "e$");
+replaceTest("xaxe$xcx", short, /b/, "e$");
+replaceTest("xaxe$xcx", short, /b/g, "e$");
+
 
 replaceTest("[$$$1$$a1abb1bb0$002$3$03][$$$1$$b1bcc1cc0$002$3$03]c", 
             "abc", /(.)(?=(.))/g, "[$$$$$$1$$$$$11$01$2$21$02$020$002$3$03]"); 
 
 // Replace with functions.
 
 
 var ctr = 0;
 replaceTest("0axbxcx", short, "x", function r(m, i, s) {
   assertEquals(3, arguments.length, "replace('x',func) func-args");
@@ skipping 47 matching lines @@
 longstring = longstring + longstring;
 longstring = longstring + longstring;
 longstring = longstring + longstring;
 longstring = longstring + longstring;
 longstring = longstring + longstring;
 longstring = longstring + longstring;
 // longstring.length == 5 << 11
 
 replaceTest(longstring + longstring, 
             "<" + longstring + ">", /<(.*)>/g, "$1$1");