Merge pull request #398 from dsyme/integrate-13

Integrate visualfsharp/OOB and fsharp/master --> master

Author: dsyme

src/absil/ilread.fs

@@ -945,6 +945,7 @@ type ILReaderContext =
     userStringsStreamPhysicalLoc: int32;
     stringsStreamPhysicalLoc: int32;
     blobsStreamPhysicalLoc: int32;
+    blobsStreamSize: int32;
     readUserStringHeap: (int32 -> string);
     memoizeString: string -> string;
     readStringHeap: (int32 -> string);
@@ -1420,9 +1421,13 @@ let readStringHeapUncached ctxtH idx =
 let readStringHeap          ctxt idx = ctxt.readStringHeap idx 
 let readStringHeapOption   ctxt idx = if idx = 0 then None else Some (readStringHeap ctxt idx) 
 
+let emptyByteArray: byte[] = [||]
 let readBlobHeapUncached ctxtH idx = 
     let ctxt = getHole ctxtH
-    seekReadBlob ctxt.is (ctxt.blobsStreamPhysicalLoc + idx) 
+    // valid index lies in range [1..streamSize)
+    // NOTE: idx cannot be 0 - Blob\String heap has first empty element that is one byte 0
+    if idx <= 0 || idx >= ctxt.blobsStreamSize then emptyByteArray
+    else seekReadBlob ctxt.is (ctxt.blobsStreamPhysicalLoc + idx) 
 let readBlobHeap        ctxt idx = ctxt.readBlobHeap idx 
 let readBlobHeapOption ctxt idx = if idx = 0 then None else Some (readBlobHeap ctxt idx) 
 
@@ -3862,6 +3867,7 @@ let rec genOpenBinaryReader infile is opts =
                  userStringsStreamPhysicalLoc   = userStringsStreamPhysicalLoc;
                  stringsStreamPhysicalLoc       = stringsStreamPhysicalLoc;
                  blobsStreamPhysicalLoc         = blobsStreamPhysicalLoc;
+                 blobsStreamSize                = blobsStreamSize;
                  memoizeString                  = Tables.memoize id;
                  readUserStringHeap             = cacheUserStringHeap (readUserStringHeapUncached ctxtH);
                  readStringHeap                 = cacheStringHeap (readStringHeapUncached ctxtH);

src/fsharp/FSComp.txt

@@ -928,9 +928,9 @@ optsEmitDebugInfoInQuotations,"Emit debug information in quotations"
 # service.fs strings
 # -----------------------------------------------------------------------------
 typeInfoFullName,"Full name"
-typeInfoType,"type"
-typeInfoInherits,"inherits"
-typeInfoImplements,"implements"
+# typeInfoType,"type"
+# typeInfoInherits,"inherits"
+# typeInfoImplements,"implements"
 typeInfoOtherOverloads,"and %d other overloads"
 typeInfoUnionCase,"union case"
 typeInfoActivePatternResult,"active pattern result"
@@ -1089,8 +1089,8 @@ lexHashBangMustBeFirstInFile,"#! may only appear as the first line at the start
 1189,parsNonAdjacentTypars,"Type parameters must be placed directly adjacent to the type name, e.g. \"type C<'T>\", not     type \"C   <'T>\""
 1190,parsNonAdjacentTyargs,"Type arguments must be placed directly adjacent to the type name, e.g. \"C<'T>\", not \"C  <'T>\""
 parsNonAtomicType,"The use of the type syntax 'int C' and 'C  <int>' is not permitted here. Consider adjusting this type to be written in the form 'C<int>'"
-1191,tastUndefinedTyconItemField,"The type %s did not contain the field '%s'"
-1192,tastUndefinedTyconItemUnionCase,"The type %s did not contain the union case '%s'"
+# 1191,tastUndefinedTyconItemField,"The type %s did not contain the field '%s'"
+# 1192,tastUndefinedTyconItemUnionCase,"The type %s did not contain the union case '%s'"
 1193,tastUndefinedItemRefModuleNamespace,"The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s'"
 1194,tastUndefinedItemRefVal,"The module/namespace '%s' from compilation unit '%s' did not contain the val '%s'"
 1195,tastUndefinedItemRefModuleNamespaceType,"The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s'"
@@ -1342,3 +1342,5 @@ estApplyStaticArgumentsForMethodNotImplemented,"A type provider implemented GetS
 3184,ppparsIncompleteExpression,"Incomplete preprocessor expression"
 3185,ppparsMissingToken,"Missing token '%s' in preprocessor expression"
 3186,pickleMissingDefinition,"An error occurred while reading the F# metadata node at position %d in table '%s' of assembly '%s'. The node had no matching declaration. Please report this warning. You may need to recompile the F# assembly you are using."
+3187,checkNotSufficientlyGenericBecauseOfScope,"Type inference caused the type variable %s to escape its scope. Consider adding an explicit type parameter declaration or adjusting your code to be less generic."
+3188,checkNotSufficientlyGenericBecauseOfScopeAnon,"Type inference caused an inference type variable to escape its scope. Consider adding type annotations to make your code less generic."

src/fsharp/Optimizer.fs

@@ -1716,9 +1716,6 @@ let TryDetectQueryQuoteAndRun cenv (expr:Expr) =
 
 let rec OptimizeExpr cenv (env:IncrementalOptimizationEnv) expr =
 
-    // foreach --> fast integer for loops
-    let expr = DetectFastIntegerForLoops cenv.g expr
-
     // Eliminate subsumption coercions for functions. This must be done post-typechecking because we need
     // complete inference types.
     let expr = NormalizeAndAdjustPossibleSubsumptionExprs cenv.g expr
@@ -2087,6 +2084,9 @@ and OptimizeLetRec cenv env (binds,bodyExpr,m) =
 //------------------------------------------------------------------------- 
 
 and OptimizeLinearExpr cenv env expr contf =
+
+    let expr = DetectAndOptimizeForExpression cenv.g OptimizeAllForExpressions expr
+
     if verboseOptimizations then dprintf "OptimizeLinearExpr\n";
     let expr = if cenv.settings.ExpandStructrualValues() then ExpandStructuralBinding cenv expr else expr 
     match expr with